From owner-svn-src-all@freebsd.org Wed Nov 1 13:50:36 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDDEFE5C6F9; Wed, 1 Nov 2017 13:50:36 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89DDC6F765; Wed, 1 Nov 2017 13:50:36 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1DoZI6033509; Wed, 1 Nov 2017 13:50:35 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1DoZ0w033508; Wed, 1 Nov 2017 13:50:35 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201711011350.vA1DoZ0w033508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 1 Nov 2017 13:50:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325281 - stable/11/sys/ufs/ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/ufs/ffs X-SVN-Commit-Revision: 325281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 13:50:36 -0000 Author: markj Date: Wed Nov 1 13:50:35 2017 New Revision: 325281 URL: https://svnweb.freebsd.org/changeset/base/325281 Log: MFC r324992: Make drain_output() use bufobj_wwait(). Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_softdep.c Wed Nov 1 13:04:54 2017 (r325280) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Wed Nov 1 13:50:35 2017 (r325281) @@ -14281,25 +14281,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); } /*