From: Andrew Deason <adeason@sinenomine.net>
Date: Sun, 30 Nov 2008 20:17:24 +0000 (+0000)
Subject: DEVEL15-linux-nonfh-cache-file-handling-20081130
X-Git-Tag: openafs-devel-1_5_56~43
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=22aa758156d592264b03f0107196fb7a0fa07671;p=packages%2Fo%2Fopenafs.git

DEVEL15-linux-nonfh-cache-file-handling-20081130

LICENSE IPL10
FIXES 123771

go back to referencing f.inode and not ainode when not using the fh cachefiles.
put back the dcache reference again.


(cherry picked from commit 4db6293a06ff573eb650cbf9bbf53440a7ee83a2)
---

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index 456ffdd37..65c95ffec 100644
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -3378,6 +3378,7 @@ afs_InitCacheFile(char *afile, ino_t ainode)
         tdc->f.fh_type = osi_get_fh(filevp, &tdc->f.fh, &max_len);
 #else
         tdc->f.inode = VTOI(filevp->d_inode)->i_number;
+	dput(filevp);
 #endif
 #else
 	tdc->f.inode = afs_vnodeToInumber(filevp);
@@ -3392,7 +3393,7 @@ afs_InitCacheFile(char *afile, ino_t ainode)
 #if defined(LINUX_USE_FH)
     tfile = osi_UFSOpen_fh(&tdc->f.fh, tdc->f.fh_type);
 #else
-    tfile = osi_UFSOpen(ainode);
+    tfile = osi_UFSOpen(tdc->f.inode);
 #endif
     code = afs_osi_Stat(tfile, &tstat);
     if (code)