aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2017-10-25 17:20:18 +0000
committerMark Johnston <markj@FreeBSD.org>2017-10-25 17:20:18 +0000
commit4c52a9993baa1eb7ec6f0c798073802e84a15912 (patch)
tree701791b5a959df934d48a806d2ea2cdedd2f3b0d /sys
parent63f8025d6acab1b334373ddd33f940a69b3b54cc (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ffs/ffs_softdep.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 1e077c2641a0..a3fd345cdf3d 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -14289,25 +14289,14 @@ softdep_get_depcounts(struct mount *mp,
/*
* Wait for pending output on a vnode to complete.
- * Must be called with vnode lock and interlock locked.
- *
- * XXX: Should just be a call to bufobj_wwait().
*/
static void
drain_output(vp)
struct vnode *vp;
{
- struct bufobj *bo;
- bo = &vp->v_bufobj;
ASSERT_VOP_LOCKED(vp, "drain_output");
- ASSERT_BO_WLOCKED(bo);
-
- while (bo->bo_numoutput) {
- bo->bo_flag |= BO_WWAIT;
- msleep((caddr_t)&bo->bo_numoutput,
- BO_LOCKPTR(bo), PRIBIO + 1, "drainvp", 0);
- }
+ (void)bufobj_wwait(&vp->v_bufobj, 0, 0);
}
/*