D20244.diff
No OneTemporary
Actions

Size

996 B

Referenced Files

None

Subscribers

None

D20244.diff
View Options

	Index: head/sys/fs/nullfs/null_subr.c
	===================================================================
	--- head/sys/fs/nullfs/null_subr.c
	+++ head/sys/fs/nullfs/null_subr.c
	@@ -222,9 +222,6 @@
	* provide ready to use vnode.
	*/
	if (VOP_ISLOCKED(lowervp) != LK_EXCLUSIVE) {
	- KASSERT((MOUNTTONULLMOUNT(mp)->nullm_flags & NULLM_CACHE) != 0,
	- ("lowervp %p is not excl locked and cache is disabled",
	- lowervp));
	vn_lock(lowervp, LK_UPGRADE \| LK_RETRY);
	if ((lowervp->v_iflag & VI_DOOMED) != 0) {
	vput(lowervp);
	Index: head/sys/fs/nullfs/null_vnops.c
	===================================================================
	--- head/sys/fs/nullfs/null_vnops.c
	+++ head/sys/fs/nullfs/null_vnops.c
	@@ -893,11 +893,7 @@
	return (ENOENT);
	}

	- /*
	- * Exclusive lock is required by insmntque1 call in
	- * null_nodeget()
	- */
	- error = vn_lock(ldvp, LK_EXCLUSIVE);
	+ error = vn_lock(ldvp, LK_SHARED);
	if (error != 0) {
	vrele(ldvp);
	vn_lock(vp, locked \| LK_RETRY);