D17253.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17253.diff
View Options

	Index: head/sys/kern/vfs_lookup.c
	===================================================================
	--- head/sys/kern/vfs_lookup.c
	+++ head/sys/kern/vfs_lookup.c
	@@ -160,10 +160,6 @@
	}
	SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL);

	-static int lookup_shared = 1;
	-SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RWTUN, &lookup_shared, 0,
	- "enables shared locks for path name translation");
	-
	static int lookup_cap_dotdot = 1;
	SYSCTL_INT(_vfs, OID_AUTO, lookup_cap_dotdot, CTLFLAG_RWTUN,
	&lookup_cap_dotdot, 0,
	@@ -307,8 +303,6 @@
	("namei: flags contaminated with nameiops"));
	MPASS(ndp->ni_startdir == NULL \|\| ndp->ni_startdir->v_type == VDIR \|\|
	ndp->ni_startdir->v_type == VBAD);
	- if (!lookup_shared)
	- cnp->cn_flags &= ~LOCKSHARED;
	fdp = p->p_fd;
	TAILQ_INIT(&ndp->ni_cap_tracker);
	ndp->ni_lcf = 0;
	@@ -660,10 +654,7 @@
	* We use shared locks until we hit the parent of the last cn then
	* we adjust based on the requesting flags.
	*/
	- if (lookup_shared)
	- cnp->cn_lkflags = LK_SHARED;
	- else
	- cnp->cn_lkflags = LK_EXCLUSIVE;
	+ cnp->cn_lkflags = LK_SHARED;
	dp = ndp->ni_startdir;
	ndp->ni_startdir = NULLVP;
	vn_lock(dp,
	@@ -1087,7 +1078,7 @@
	VOP_UNLOCK(dp, 0);
	success:
	/*
	- * Because of lookup_shared we may have the vnode shared locked, but
	+ * Because of shared lookup we may have the vnode shared locked, but
	* the caller may want it to be exclusively locked.
	*/
	if (needs_exclusive_leaf(dp->v_mount, cnp->cn_flags) &&