From owner-dev-commits-src-branches@freebsd.org Sat May 29 12:17:33 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA41A63FBBD; Sat, 29 May 2021 12:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsgY94nRbz4mg0; Sat, 29 May 2021 12:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B3BA1E78; Sat, 29 May 2021 12:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14TCHXU5044546; Sat, 29 May 2021 12:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14TCHX1L044545; Sat, 29 May 2021 12:17:33 GMT (envelope-from git) Date: Sat, 29 May 2021 12:17:33 GMT Message-Id: <202105291217.14TCHX1L044545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 67e2940b2973 - stable/13 - nullfs: dirty v_object must imply the need for inactivation MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 67e2940b2973d2d37c6a3886f1755d54917fa972 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 12:17:34 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=67e2940b2973d2d37c6a3886f1755d54917fa972 commit 67e2940b2973d2d37c6a3886f1755d54917fa972 Author: Konstantin Belousov AuthorDate: 2021-05-21 07:30:19 +0000 Commit: Konstantin Belousov CommitDate: 2021-05-29 11:48:09 +0000 nullfs: dirty v_object must imply the need for inactivation (cherry picked from commit 42881526d401e7a9c09241e392b7ffa18cfe11d6) --- sys/fs/nullfs/null_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 607755fd62d9..3b4e30d8a499 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -818,7 +818,7 @@ static int null_need_inactive(struct vop_need_inactive_args *ap) { - return (null_want_recycle(ap->a_vp)); + return (null_want_recycle(ap->a_vp) || vn_need_pageq_flush(ap->a_vp)); } /*