code = -ENOENT;
goto out;
}
- ObtainSharedLock(&avc->lock, 810);
- UpgradeSToWLock(&avc->lock, 811);
+ ObtainWriteLock(&avc->lock, 811);
ObtainReadLock(&tdc->lock);
/*
* Make sure that the data in the cache is current. There are two
&& (tdc->dflags & DFFetching)
&& hsame(avc->f.m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
- ReleaseSharedLock(&avc->lock);
+ ReleaseWriteLock(&avc->lock);
afs_osi_Sleep(&tdc->validPos);
- ObtainSharedLock(&avc->lock, 812);
+ ObtainWriteLock(&avc->lock, 812);
ObtainReadLock(&tdc->lock);
}
if (!(avc->f.states & CStatd)
|| !hsame(avc->f.m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
- ReleaseSharedLock(&avc->lock);
+ ReleaseWriteLock(&avc->lock);
afs_PutDCache(tdc);
goto tagain;
}
if (!dirpos)
break;
- code = afs_dir_GetBlob(tdc, dirpos, &entry);
- if (code)
- break;
- de = (struct DirEntry *)entry.data;
-
- ino = afs_calc_inum (avc->f.fid.Fid.Volume, ntohl(de->fid.vnode));
-
- if (de->name)
- len = strlen(de->name);
- else {
- printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %lx, dirpos %d)\n",
- (unsigned long)&tdc->f.inode, dirpos);
- DRelease(&entry, 0);
+ code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry);
+ if (code) {
+ afs_warn("Corrupt directory (inode %lx, dirpos %d)",
+ (unsigned long)&tdc->f.inode, dirpos);
ReleaseSharedLock(&avc->lock);
afs_PutDCache(tdc);
code = -ENOENT;
goto out;
- }
+ }
+
+ de = (struct DirEntry *)entry.data;
+ ino = afs_calc_inum (avc->f.fid.Cell, avc->f.fid.Fid.Volume,
+ ntohl(de->fid.vnode));
+ len = strlen(de->name);
/* filldir returns -EINVAL when the buffer is full. */
{
int code;
char *name;
- name = osi_Alloc(PATH_MAX);
+ name = kmalloc(PATH_MAX, GFP_NOFS);
if (!name) {
return -EIO;
}
afs_linux_put_link(struct dentry *dentry, struct nameidata *nd)
{
char *name = nd_get_link(nd);
- if (name && !IS_ERR(name)) {
- osi_Free(name, PATH_MAX);
- }
+
+ if (name && !IS_ERR(name))
+ kfree(name);
}
#endif /* USABLE_KERNEL_PAGE_SYMLINK_CACHE */
struct inode *cacheinode = cachefp->f_dentry->d_inode;
struct page *newpage, *cachepage;
struct address_space *cachemapping;
- int pageindex, endindex;
+ int pageindex;
int code = 0;
cachemapping = cacheinode->i_mapping;
address = kmap(pp);
ClearPageError(pp);
- auio = osi_Alloc(sizeof(struct uio));
- iovecp = osi_Alloc(sizeof(struct iovec));
+ auio = kmalloc(sizeof(struct uio), GFP_NOFS);
+ iovecp = kmalloc(sizeof(struct iovec), GFP_NOFS);
setup_uio(auio, iovecp, (char *)address, offset, PAGE_SIZE, UIO_READ,
AFS_UIOSYS);
kunmap(pp);
- osi_Free(auio, sizeof(struct uio));
- osi_Free(iovecp, sizeof(struct iovec));
+ kfree(auio);
+ kfree(iovecp);
crfree(credp);
return afs_convert_code(code);