diff options
| author | mckusick <mckusick@FreeBSD.org> | 2012-04-11 23:01:11 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2012-04-11 23:01:11 +0000 |
| commit | 7901256b30173c2a03a22934f725363bd169a6b9 (patch) | |
| tree | b6f75a1a8fdc2f0e9a07d37d62f72417952ca850 /sys/ufs | |
| parent | 54bf4ddfa2a9af2fd33eedd42f37c20e8dcaff31 (diff) | |
| download | FreeBSD-src-7901256b30173c2a03a22934f725363bd169a6b9.zip FreeBSD-src-7901256b30173c2a03a22934f725363bd169a6b9.tar.gz | |
Export vinactive() from kern/vfs_subr.c (e.g., make it no longer
static and declare its prototype in sys/vnode.h) so that it can be
called from process_deferred_inactive() (in ufs/ffs/ffs_snapshot.c)
instead of the body of vinactive() being cut and pasted into
process_deferred_inactive().
Reviewed by: kib
MFC after: 2 weeks
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_snapshot.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index dfd0040..4f90ef6 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -2572,20 +2572,9 @@ process_deferred_inactive(struct mount *mp) MNT_ILOCK(mp); continue; } - - VNASSERT((vp->v_iflag & VI_DOINGINACT) == 0, vp, - ("process_deferred_inactive: " - "recursed on VI_DOINGINACT")); - vp->v_iflag |= VI_DOINGINACT; - vp->v_iflag &= ~VI_OWEINACT; - VI_UNLOCK(vp); - (void) VOP_INACTIVE(vp, td); - VI_LOCK(vp); - VNASSERT(vp->v_iflag & VI_DOINGINACT, vp, - ("process_deferred_inactive: lost VI_DOINGINACT")); + vinactive(vp, td); VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp, ("process_deferred_inactive: got VI_OWEINACT")); - vp->v_iflag &= ~VI_DOINGINACT; VI_UNLOCK(vp); VOP_UNLOCK(vp, 0); vdrop(vp); |
