aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Holm <pho@FreeBSD.org>2011-10-31 09:22:09 +0000
committerPeter Holm <pho@FreeBSD.org>2011-10-31 09:22:09 +0000
commite8ca6e24fb41f4d891ad0314b2aab0897d495e76 (patch)
tree9cfea8c42358661d2a0b9af0fb29a9ab9a8c7a45
parent0523b6821a42271d7f05439046627a9ec91dcf08 (diff)
Notes
-rw-r--r--sys/fs/nullfs/null_vfsops.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 7bd4ab7d2794..ac5cf085dd72 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -104,11 +104,10 @@ nullfs_mount(struct mount *mp)
return (EINVAL);
/*
- * Unlock lower node to avoid deadlock.
- * (XXX) VOP_ISLOCKED is needed?
+ * Unlock lower node to avoid possible deadlock.
*/
if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) &&
- VOP_ISLOCKED(mp->mnt_vnodecovered)) {
+ VOP_ISLOCKED(mp->mnt_vnodecovered) == LK_EXCLUSIVE) {
VOP_UNLOCK(mp->mnt_vnodecovered, 0);
isvnunlocked = 1;
}