D52935.id163632.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52935.id163632.diff
View Options

	diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
	--- a/sys/fs/nullfs/null_subr.c
	+++ b/sys/fs/nullfs/null_subr.c
	@@ -40,8 +40,8 @@
	#include <sys/malloc.h>
	#include <sys/mount.h>
	#include <sys/proc.h>
	-#include <sys/vnode.h>
	#include <sys/smr.h>
	+#include <sys/vnode.h>

	#include <fs/nullfs/null.h>

	@@ -143,7 +143,7 @@
	struct vnode *vp;
	enum vgetstate vs;

	- ASSERT_VOP_LOCKED(lowervp, "null_hashget");
	+ ASSERT_VOP_LOCKED(lowervp, __func__);
	rw_assert(&null_hash_lock, RA_UNLOCKED);

	vfs_smr_enter();
	diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
	--- a/sys/fs/nullfs/null_vnops.c
	+++ b/sys/fs/nullfs/null_vnops.c
	@@ -788,10 +788,10 @@
	struct null_node *nn;
	struct vnode *lvp;

	- vfs_smr_enter();
	-
	lvp = NULL;

	+ vfs_smr_enter();
	+
	nn = VTONULL_SMR(ap->a_vp);
	if (__predict_true(nn != NULL)) {
	lvp = nn->null_lowervp;
	@@ -855,6 +855,8 @@
	* case by reacquiring correct lock in requested mode.
	*/
	if (VTONULL(ap->a_vp) == NULL && error == 0) {
	+ VOP_UNLOCK(lvp);
	+
	flags = ap->a_flags;
	ap->a_flags &= ~LK_TYPE_MASK;
	switch (flags & LK_TYPE_MASK) {
	@@ -869,7 +871,6 @@
	panic("Unsupported lock request %d\n",
	flags);
	}
	- VOP_UNLOCK(lvp);
	error = vop_stdlock(ap);
	}
	vdrop(lvp);