From owner-dev-commits-src-branches@freebsd.org Sat May 29 12:17:32 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 A896563FC05; Sat, 29 May 2021 12:17:32 +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 4FsgY84PF5z4mcQ; Sat, 29 May 2021 12:17:32 +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 7ECFD1F46; Sat, 29 May 2021 12:17:32 +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 14TCHWTq044525; Sat, 29 May 2021 12:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14TCHW3i044524; Sat, 29 May 2021 12:17:32 GMT (envelope-from git) Date: Sat, 29 May 2021 12:17:32 GMT Message-Id: <202105291217.14TCHW3i044524@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: dfdd29b6083c - stable/13 - vn_need_pageq_flush(): simplify 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: dfdd29b6083c1941b7a9579baf5fe08a0438aa8f 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:32 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dfdd29b6083c1941b7a9579baf5fe08a0438aa8f commit dfdd29b6083c1941b7a9579baf5fe08a0438aa8f Author: Konstantin Belousov AuthorDate: 2021-05-21 07:34:27 +0000 Commit: Konstantin Belousov CommitDate: 2021-05-29 11:48:09 +0000 vn_need_pageq_flush(): simplify (cherry picked from commit d713bf79273ad928f591dee2f8a553487e515e9b) --- sys/kern/vfs_subr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 270dab02bf39..ee570f216b40 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5122,14 +5122,10 @@ int vn_need_pageq_flush(struct vnode *vp) { struct vm_object *obj; - int need; - MPASS(mtx_owned(VI_MTX(vp))); - need = 0; - if ((obj = vp->v_object) != NULL && (vp->v_vflag & VV_NOSYNC) == 0 && - vm_object_mightbedirty(obj)) - need = 1; - return (need); + obj = vp->v_object; + return (obj != NULL && (vp->v_vflag & VV_NOSYNC) == 0 && + vm_object_mightbedirty(obj)); } /*