remove the simplelock argument from vfs_busy() which is currently not

used and will never be used this way in VFS

requested by and ok pedro, ok krw, biorn

5 files changed, 35 insertions, 4 deletions

diff --git a/usr.sbin/afs/include/config.h b/usr.sbin/afs/include/config.h
index 32e33f0ec59..28b1ffcc284 100644
--- a/usr.sbin/afs/include/config.h
+++ b/usr.sbin/afs/include/config.h
@@ -1260,7 +1260,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* #undef HAVE_THREE_ARGUMENT_SELRECORD */
 
 /* define if vfs_busy takes three arguments */
-#define HAVE_THREE_ARGUMENT_VFS_BUSY 1
+/* #undef HAVE_THREE_ARGUMENT_VFS_BUSY */
 
 /* define if vfs_name_hash takes three arguments */
 /* #undef HAVE_THREE_ARGUMENT_VFS_NAME_HASH */
@@ -1289,6 +1289,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* define if vfs_getnewfsid takes two arguments */
 /* #undef HAVE_TWO_ARGUMENT_VFS_GETNEWFSID */
 
+/* define if vfs_busy takes two arguments */
+#define HAVE_TWO_ARGUMENT_VFS_BUSY 1
+
 /* define if vget takes two arguments */
 /* #undef HAVE_TWO_ARGUMENT_VGET */
 
diff --git a/usr.sbin/afs/src/cf/bsd-vfs-busy.m4 b/usr.sbin/afs/src/cf/bsd-vfs-busy.m4
index fdc694fd94c..f73f34abd6d 100644
--- a/usr.sbin/afs/src/cf/bsd-vfs-busy.m4
+++ b/usr.sbin/afs/src/cf/bsd-vfs-busy.m4
@@ -3,10 +3,29 @@ dnl $KTH: bsd-vfs-busy.m4,v 1.3 2000/02/20 03:06:43 assar Exp $
 dnl
 
 dnl
-dnl try to find out if vfs_busy takes three/four arguments
+dnl try to find out if vfs_busy takes two/three/four arguments
 dnl
 
 AC_DEFUN(AC_BSD_FUNC_VFS_BUSY,[
+AC_CACHE_CHECK(if vfs_busy takes two arguments, ac_cv_func_vfs_busy_two_args,
+AC_TRY_COMPILE_KERNEL([
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/ucred.h>
+#ifdef HAVE_SYS_MODULE_H
+#include <sys/module.h>
+#endif
+#include <sys/mount.h>],[vfs_busy(0, 0)],
+ac_cv_func_vfs_busy_two_args=yes,
+ac_cv_func_vfs_busy_two_args=no))
+if test "$ac_cv_func_vfs_busy_two_args" = yes; then
+	AC_DEFINE(HAVE_TWO_ARGUMENT_VFS_BUSY, 1,
+	[define if vfs_busy takes two arguments])
+fi
+
 AC_CACHE_CHECK(if vfs_busy takes three arguments, ac_cv_func_vfs_busy_three_args,
 AC_TRY_COMPILE_KERNEL([
 #ifdef HAVE_SYS_CDEFS_H
diff --git a/usr.sbin/afs/src/include/config.h b/usr.sbin/afs/src/include/config.h
index fc1004e302b..28f7a7f56ea 100644
--- a/usr.sbin/afs/src/include/config.h
+++ b/usr.sbin/afs/src/include/config.h
@@ -882,7 +882,7 @@
 #define HAVE_THREE_ARGUMENT_VOP_LOCK 1
 
 /* define if vfs_busy takes three arguments */
-#define HAVE_THREE_ARGUMENT_VFS_BUSY 1
+/* #undef HAVE_THREE_ARGUMENT_VFS_BUSY */
 
 /* define if vfs_busy takes four arguments */
 /* #undef HAVE_FOUR_ARGUMENT_VFS_BUSY */
@@ -902,6 +902,9 @@
 /* define if vfs_getnewfsid takes two arguments */
 /* #undef HAVE_TWO_ARGUMENT_VFS_GETNEWFSID */
 
+/* define if vfs_busy takes two arguments */
+#define HAVE_TWO_ARGUMENT_VFS_BUSY 1
+
 /* define if lockmgr takes four arguments */
 #define HAVE_FOUR_ARGUMENT_LOCKMGR 1
 
diff --git a/usr.sbin/afs/src/include/config.h.in b/usr.sbin/afs/src/include/config.h.in
index 394e60f2048..426464ddec5 100644
--- a/usr.sbin/afs/src/include/config.h.in
+++ b/usr.sbin/afs/src/include/config.h.in
@@ -1291,6 +1291,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* define if vfs_getnewfsid takes two arguments */
 #undef HAVE_TWO_ARGUMENT_VFS_GETNEWFSID
 
+/* define if vfs_busy takes two arguments */
+#undef HAVE_TWO_ARGUMENT_VFS_BUSY
+
 /* define if vget takes two arguments */
 #undef HAVE_TWO_ARGUMENT_VGET
 
diff --git a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_dev-common.c b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_dev-common.c
index 10c053884b7..e1d90bf1cd1 100644
--- a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_dev-common.c
+++ b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_dev-common.c
@@ -113,7 +113,10 @@ nnpfs_devopen_common(dev_t dev)
     return 0;
 }
 
-#if defined(HAVE_THREE_ARGUMENT_VFS_BUSY)
+#if defined(HAVE_TWO_ARGUMENT_VFS_BUSY)
+#define nnpfs_vfs_busy(mp, flags, lock, proc) vfs_busy((mp), (flags))
+#define nnpfs_vfs_unbusy(mp, proc) vfs_unbusy((mp))
+#elif defined(HAVE_THREE_ARGUMENT_VFS_BUSY)
 #define nnpfs_vfs_busy(mp, flags, lock, proc) vfs_busy((mp), (flags), (lock))
 #define nnpfs_vfs_unbusy(mp, proc) vfs_unbusy((mp))
 #elif defined(HAVE_FOUR_ARGUMENT_VFS_BUSY)