From f20992328ccae8aae87c3e9afe98654280616da9 Mon Sep 17 00:00:00 2001 From: bp Date: Sun, 22 Oct 2000 15:40:22 +0000 Subject: [PATCH] Release and unlock vnode if resource deadlock detected. --- sys/fs/nullfs/null_vfsops.c | 1 + sys/miscfs/nullfs/null_vfsops.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 45f950e17520..20c34594541e 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -150,6 +150,7 @@ nullfs_mount(mp, path, data, ndp, p) */ if (lowerrootvp == VTONULL(mp->mnt_vnodecovered)->null_lowervp) { NULLFSDEBUG("nullfs_mount: multi null mount?\n"); + VOP_UNLOCK(lowerrootvp, 0, p); return (EDEADLK); } diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 45f950e17520..20c34594541e 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -150,6 +150,7 @@ nullfs_mount(mp, path, data, ndp, p) */ if (lowerrootvp == VTONULL(mp->mnt_vnodecovered)->null_lowervp) { NULLFSDEBUG("nullfs_mount: multi null mount?\n"); + VOP_UNLOCK(lowerrootvp, 0, p); return (EDEADLK); }