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 6b9532f2923873dfd3057de5fa69ff2371510b41..12cacb0036ad21cbef7fdb1a4724d89baa5fcf3d 100644 (file)
--- 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 b48b1d732208f1fb39b8cca0f060bc44ccb581d2..56c42a3272b7c85c3293aec6097098edeed9a309 100644 (file)
--- 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 9626d3d196436688116dcaa597f64b54baf059a1..b45ba6cfb54efbd93ab1b0407bcc359a5e9b7c1a 100644 (file)
--- 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)