svn commit: r193138 - in head: . sys/kern sys/sys

[Attilio Rao]

Author: attilio
Date: Sat May 30 23:52:23 2009
New Revision: 193138
URL: http://svn.freebsd.org/changeset/base/193138

Log:
  Remove the now invalid (and possibly unused) debug.mpsafevfs
  sysctl/tunable.
  
  Reviewed by:	emaste
  Sponsored by:	Sandvine Incorporated

Modified:
  head/UPDATING
  head/sys/kern/vfs_subr.c
  head/sys/sys/mount.h

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat May 30 23:51:02 2009	(r193137)
+++ head/UPDATING	Sat May 30 23:52:23 2009	(r193138)
@@ -23,6 +23,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	ln -s aj /etc/malloc.conf.)
 
 20090530:
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
+	is no more valid.
+
+20090530:
 	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
 	Bump __FreeBSD_version to 800094.
 

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Sat May 30 23:51:02 2009	(r193137)
+++ head/sys/kern/vfs_subr.c	Sat May 30 23:52:23 2009	(r193138)
@@ -115,15 +115,6 @@ static int	vfs_knllocked(void *arg);
 static void	destroy_vpollinfo(struct vpollinfo *vi);
 
 /*
- * Enable Giant pushdown based on whether or not the vm is mpsafe in this
- * build.  Without mpsafevm the buffer cache can not run Giant free.
- */
-int mpsafe_vfs = 1;
-TUNABLE_INT("debug.mpsafevfs", &mpsafe_vfs);
-SYSCTL_INT(_debug, OID_AUTO, mpsafevfs, CTLFLAG_RD, &mpsafe_vfs, 0,
-    "MPSAFE VFS");
-
-/*
  * Number of vnodes in existence.  Increased whenever getnewvnode()
  * allocates a new vnode, decreased on vdestroy() called on VI_DOOMed
  * vnode.

Modified: head/sys/sys/mount.h
==============================================================================
--- head/sys/sys/mount.h	Sat May 30 23:51:02 2009	(r193137)
+++ head/sys/sys/mount.h	Sat May 30 23:52:23 2009	(r193138)
@@ -619,10 +619,8 @@ vfs_statfs_t	__vfs_statfs;
 	({if (*(MP)->mnt_op->vfs_susp_clean != NULL)		\
 	       (*(MP)->mnt_op->vfs_susp_clean)(MP); })
 
-extern int mpsafe_vfs;
-
 #define	VFS_NEEDSGIANT_(MP)						\
-    (!mpsafe_vfs || ((MP) != NULL && ((MP)->mnt_kern_flag & MNTK_MPSAFE) == 0))
+    ((MP) != NULL && ((MP)->mnt_kern_flag & MNTK_MPSAFE) == 0)
 
 #define	VFS_NEEDSGIANT(MP) __extension__				\
 ({									\