D53107.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53107.id.diff
View Options

	diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
	--- a/sys/fs/unionfs/union_vnops.c
	+++ b/sys/fs/unionfs/union_vnops.c
	@@ -2208,7 +2208,6 @@
	vholdnz(tvp);
	VI_UNLOCK(vp);
	error = VOP_LOCK(tvp, flags);
	- vdrop(tvp);
	if (error == 0 && (lvp_locked \|\| VTOUNIONFS(vp) == NULL)) {
	/*
	* After dropping the interlock above, there exists a window
	@@ -2234,6 +2233,7 @@
	unp = VTOUNIONFS(vp);
	if (unp == NULL \|\| unp->un_uppervp != NULL) {
	VOP_UNLOCK(tvp);
	+ vdrop(tvp);
	/*
	* If we previously held the lock, the upgrade may
	* have temporarily dropped the lock, in which case
	@@ -2249,6 +2249,7 @@
	goto unionfs_lock_restart;
	}
	}
	+ vdrop(tvp);

	return (error);
	}
	@@ -2259,7 +2260,6 @@
	struct vnode *vp;
	struct vnode *tvp;
	struct unionfs_node *unp;
	- int error;

	KASSERT_UNIONFS_VNODE(ap->a_vp);

	@@ -2271,11 +2271,7 @@

	tvp = (unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp);

	- vholdnz(tvp);
	- error = VOP_UNLOCK(tvp);
	- vdrop(tvp);
	-
	- return (error);
	+ return (VOP_UNLOCK(tvp));
	}

	static int