From: Andrew Deason Date: Tue, 24 Jul 2012 23:18:13 +0000 (-0500) Subject: LINUX24: explicit dir buffers fallout X-Git-Tag: upstream/1.8.0_pre1^2~2159 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6dd0bc6bed79013fe1737f3e9016066ee74958fd;p=packages%2Fo%2Fopenafs.git LINUX24: explicit dir buffers fallout Fix fallout from 0284e65f97861e888d95576f22a93cd681813c39 Change-Id: I40a16fee3bb3835690f7ff7328f70d3454fd1198 Reviewed-on: http://gerrit.openafs.org/7874 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/LINUX24/osi_vnodeops.c b/src/afs/LINUX24/osi_vnodeops.c index 5821a7499..5d0d58980 100644 --- a/src/afs/LINUX24/osi_vnodeops.c +++ b/src/afs/LINUX24/osi_vnodeops.c @@ -223,6 +223,7 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir) int offset; int dirpos; struct DirEntry *de; + struct DirBuffer entry; ino_t ino; int len; afs_size_t origOffset, tlen; @@ -312,7 +313,7 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir) else { printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %lx, dirpos %d)\n", (unsigned long)&tdc->f.inode, dirpos); - DRelease(de, 0); + DRelease(&entry, 0); ReleaseSharedLock(&avc->lock); afs_PutDCache(tdc); code = -ENOENT; @@ -363,7 +364,7 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir) #else code = (*filldir) (dirbuf, de->name, len, offset, ino); #endif - DRelease(de, 0); + DRelease(&entry, 0); if (code) break; offset = dirpos + 1 + ((len + 16) >> 5);