From: Matt Benjamin <matt@linuxbox.com>
Date: Wed, 25 Aug 2010 00:48:24 +0000 (-0400)
Subject: BSD CMs:  Don't call nonexistent afs_FlushVS in afs_vop_reclaim
X-Git-Tag: openafs-devel-1_5_77~37
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=af0f3d85e7ebf711f7a9164e7f927061fadfadd2;p=packages%2Fo%2Fopenafs.git

BSD CMs:  Don't call nonexistent afs_FlushVS in afs_vop_reclaim

Revert BSDs to call FlushVCache in their respective reclaim vops,
afs_FlushVS no longer exists.

FIXES 127955

Change-Id: I842356c2d6ee4fa3a49eaa8594f1b52188c24985
Reviewed-on: http://gerrit.openafs.org/2611
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 3f7b70a28ba7dc03f0fc973343669f0a7967de4c)
Reviewed-on: http://gerrit.openafs.org/2676
---

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 6b9532f29..12cacb003 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -1467,7 +1467,7 @@ afs_vop_reclaim(struct vop_reclaim_args *ap)
     if (!haveVlock)
 	ObtainWriteLock(&afs_xvcache, 901);
     /* reclaim the vnode and the in-memory vcache, but keep the on-disk vcache */
-    code = afs_FlushVS(avc);
+    code = afs_FlushVCache(avc, &slept);
     if (!haveVlock)
 	ReleaseWriteLock(&afs_xvcache);
     if (!haveGlock)
diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c
index b48b1d732..56c42a327 100644
--- a/src/afs/NBSD/osi_vnodeops.c
+++ b/src/afs/NBSD/osi_vnodeops.c
@@ -114,8 +114,6 @@ NONINFRINGEMENT.
 #include "afs/nfsclient.h"
 #include "afs/afs_osidnlc.h"
 
-extern int afs_FlushVS(struct vcache *tvc);
-
 #define M_AFSNODE (M_TEMP-1)	/* XXX */
 
 int afs_nbsd_lookup(void *);
@@ -959,7 +957,7 @@ afs_nbsd_reclaim(void *v)
     if (!haveVlock)
 	ObtainWriteLock(&afs_xvcache, 901);
     /* reclaim the vnode and the in-memory vcache, but keep the on-disk vcache */
-    code = afs_FlushVS(avc);
+    code = afs_FlushVCache(avc, &slept);
     if (!haveVlock)
 	ReleaseWriteLock(&afs_xvcache);
     if (!haveGlock)
diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c
index 9626d3d19..b45ba6cfb 100644
--- a/src/afs/OBSD/osi_vnodeops.c
+++ b/src/afs/OBSD/osi_vnodeops.c
@@ -113,8 +113,6 @@ NONINFRINGEMENT.
 #include "afs/nfsclient.h"
 #include "afs/afs_osidnlc.h"
 
-extern int afs_FlushVS(struct vcache *tvc);
-
 #define M_AFSNODE (M_TEMP-1)	/* XXX */
 
 int afs_obsd_lookup(void *);
@@ -907,7 +905,7 @@ afs_obsd_reclaim(void *v)
     if (!haveVlock)
 	ObtainWriteLock(&afs_xvcache, 901);
     /* reclaim the vnode and the in-memory vcache, but keep the on-disk vcache */
-    code = afs_FlushVS(avc);
+    code = afs_FlushVCache(avc, &slept);
     if (!haveVlock)
 	ReleaseWriteLock(&afs_xvcache);
     if (!haveGlock)