5 files changed, 13 insertions, 12 deletions

diff --git a/sys/conf/options b/sys/conf/options
index 3339b969ea15..16b918c7d274 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -383,7 +383,7 @@ BLKDEV_IOSIZE		opt_global.h
 DEBUG			opt_global.h
 DEBUG_LOCKS		opt_global.h
 DEBUG_VFS_LOCKS		opt_global.h
-LOOKUP_SHARED		opt_global.h
+LOOKUP_EXCLUSIVE	opt_global.h
 DIAGNOSTIC		opt_global.h
 ENABLE_VFS_IOOPT	opt_global.h
 INVARIANT_SUPPORT	opt_global.h
@@ -397,6 +397,7 @@ VM_KMEM_SIZE		opt_vm.h
 VM_KMEM_SIZE_SCALE	opt_vm.h
 VM_KMEM_SIZE_MAX	opt_vm.h
 NO_SWAPPING		opt_vm.h
+MALLOC_PROFILE		opt_vm.h
 PQ_NOOPT		opt_vmpage.h
 PQ_NORMALCACHE		opt_vmpage.h
 PQ_MEDIUMCACHE		opt_vmpage.h
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 6fd537f90b21..49bd83f0b080 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -566,7 +566,7 @@ vfs_cache_lookup(ap)
 
 	error = cache_lookup(dvp, vpp, cnp);
 
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 	if (!error) {
 		/* We do this because the rest of the system now expects to get
 		 * a shared lock, which is later upgraded if LOCKSHARED is not
@@ -608,7 +608,7 @@ vfs_cache_lookup(ap)
 	} else if (flags & ISDOTDOT) {
 		VOP_UNLOCK(dvp, 0, td);
 		cnp->cn_flags |= PDIRUNLOCK;
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 		if ((flags & ISLASTCN) && (flags & LOCKSHARED))
 			error = vget(vp, LK_SHARED, td);
 		else
@@ -622,7 +622,7 @@ vfs_cache_lookup(ap)
 				cnp->cn_flags &= ~PDIRUNLOCK;
 		}
 	} else {
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 		if ((flags & ISLASTCN) && (flags & LOCKSHARED))
 			error = vget(vp, LK_SHARED, td);
 		else
@@ -654,7 +654,7 @@ vfs_cache_lookup(ap)
 			return (error);
 		cnp->cn_flags &= ~PDIRUNLOCK;
 	}
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 	error = VOP_CACHEDLOOKUP(dvp, vpp, cnp);
 
 	if (!error) {
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 8de1c0ec0d46..157f6bef3f34 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -2577,7 +2577,7 @@ stat(td, uap)
 	int error;
 	struct nameidata nd;
 
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 	NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ,
 	    UIO_USERSPACE, SCARG(uap, path), td);
 #else
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 8de1c0ec0d46..157f6bef3f34 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -2577,7 +2577,7 @@ stat(td, uap)
 	int error;
 	struct nameidata nd;
 
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 	NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ,
 	    UIO_USERSPACE, SCARG(uap, path), td);
 #else
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 9eb60f93d693..3187a47641fe 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -106,7 +106,7 @@ vn_open_cred(ndp, flagp, cmode, cred)
 	struct vattr vat;
 	struct vattr *vap = &vat;
 	int mode, fmode, error;
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 	int exclusive;	/* The current intended lock state */
 
 	exclusive = 0;
@@ -149,7 +149,7 @@ restart:
 			ASSERT_VOP_LOCKED(ndp->ni_vp, "create");
 			fmode &= ~O_TRUNC;
 			vp = ndp->ni_vp;
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 			exclusive = 1;
 #endif
 		} else {
@@ -167,7 +167,7 @@ restart:
 		}
 	} else {
 		ndp->ni_cnd.cn_nameiop = LOOKUP;
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 		ndp->ni_cnd.cn_flags =
 		    ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) |
 		    LOCKSHARED | LOCKLEAF;
@@ -213,7 +213,7 @@ restart:
 	 * Make sure that a VM object is created for VMIO support.
 	 */
 	if (vn_canvmio(vp) == TRUE) {
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 		int flock;
 
 		if (!exclusive && vp->v_object == NULL)
@@ -236,7 +236,7 @@ restart:
 			*flagp = fmode;
 			return (error);
 		}
-#ifdef LOOKUP_SHARED
+#ifndef LOOKUP_EXCLUSIVE
 		flock = VOP_ISLOCKED(vp, td);
 		if (!exclusive && flock == LK_EXCLUSIVE)
 			VOP_LOCK(vp, LK_DOWNGRADE, td);