diff options
author | jeff <jeff@FreeBSD.org> | 2005-04-11 11:17:20 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2005-04-11 11:17:20 +0000 |
commit | 69e9f89f88c53c8dd5a2bc9c4ddd5696c9022717 (patch) | |
tree | ca36b9885bf7318eee0b00a9d385240d5cbadfe1 /sys/fs/nullfs | |
parent | 9375f1d524ba0f970fba08b6798c72309e07c4be (diff) | |
download | FreeBSD-src-69e9f89f88c53c8dd5a2bc9c4ddd5696c9022717.zip FreeBSD-src-69e9f89f88c53c8dd5a2bc9c4ddd5696c9022717.tar.gz |
- Clear VI_OWEINACT before calling vget() with no lock type. We know
the node is actually already locked, and VOP_INACTIVE is not desirable
in this case.
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r-- | sys/fs/nullfs/null_subr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index e665675..f0ab73a 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -133,6 +133,12 @@ loop: VOP_UNLOCK(vp, 0, td); goto loop; } + /* + * We need to clear the OWEINACT flag here as this + * may lead vget() to try to lock our vnode which + * is already locked via lowervp. + */ + vp->v_iflag &= ~VI_OWEINACT; vget(vp, LK_INTERLOCK, td); return (vp); } @@ -174,6 +180,7 @@ loop: VOP_UNLOCK(ovp, 0, td); goto loop; } + ovp->v_iflag &= ~VI_OWEINACT; /* see hashget comment */ vget(ovp, LK_INTERLOCK, td); return (ovp); } |