From nobody Sun Feb 26 13:45:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PPlHd5NNFz3tcKM; Sun, 26 Feb 2023 13:45:01 +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 4PPlHd4kYhz3RLw; Sun, 26 Feb 2023 13:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677419101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzKAQzZ3oTCZadhBy3w2eHjmyHdSEcYQwjNsmyJWt8o=; b=e1k064gNqkJpFdivznjbm7sziWio/1ljoaE2SBzEz2X18/Yy3ctpogS1leQHxqoJRnhvFW lDuXB0n7hJunv9/sTKwU6WFd0LvbNrhEmDOebszccrIIYdRtHjRYR/v4ld3It75H30KK8X +9XoSOA5UJtwcgBXLghMwH3Aa4/AONdnyk7YBobwTZOBX4XMVM15+c5qpMymgbuZ0ybIKz 2fR0o/2W9FcdF+7MoAQopHZEbBdnbeygpx2T10pYeeaFHgEVjrfIyxknoJqAINAC3HafHh a70KYDlZ1L84FPKszXfL3LUQl8ifdjCofLoBV7I+bGP9ce2po0xsLbrNEfv/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677419101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzKAQzZ3oTCZadhBy3w2eHjmyHdSEcYQwjNsmyJWt8o=; b=Cv+XfQ0zf9/MVLLJ3StzG9lqd8q88A2mlvKL3nLP2SGZgr6u3UWVIbnDa+TrD5cn1P6x92 tA/VsNGb59HliIkA3WT/p/LWK1TiIhQ5BelQIvaFrM8jaZMno9xREU95aR8KyNttm8Xokf LbjIUcwrbN5LYZIvmzRgP/gskYKkZ7wuVRqcFOKd3bMUic0xrvB9WR8JZCvBaXdWzNJreI sm4vyDouXmq6XjUdE4DdZcaVrpeb0QIhJ8CMYrOQnPlHXti1yyVf7pNVhvPD30AG0aTFt0 62QCVlm7ODCg5l3M7oy3PTvtviYFG6qOVCC3TzEXaoQE+eFzgmVVPV97PQZavw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677419101; a=rsa-sha256; cv=none; b=lkoQC3bpPKBg+4z5Jzu8NmBobyNxG0cNyUGnrZuyKdMeitJYEncAhrYIYTzrkRFdNA+wm3 hM3wcUEF6OZ9Lp1zoP3kZhavGMQyBm50Egz02Jo0YeH2F8rhiuc7jvV6Q93RTvArdDSj3m kypCUaDfjR2P2ReZfFjOVfbjRl7NVQiLna4aIHchecVtwlZziiCYSYof3vq23NfvRzErXl XWz7PBO/fNp7poiEsbGvCOetw93drPVjpj+tArgyfp+8JJvj8idi02wJBSv6/1AGmN/pCj mXbAh3V45uI4W73x0oH60akFo/BqJbWhv7/EDIANUhSsOgVao7//AzrCdCNqMg== 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 4PPlHd3mxlznLs; Sun, 26 Feb 2023 13:45:01 +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 31QDj1eo026595; Sun, 26 Feb 2023 13:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QDj1Jq026594; Sun, 26 Feb 2023 13:45:01 GMT (envelope-from git) Date: Sun, 26 Feb 2023 13:45:01 GMT Message-Id: <202302261345.31QDj1Jq026594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5ff7fb76cbae - main - nfs: patch up MNT_LAZY on sync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ff7fb76cbaea42348b63d23089e9e0549b19cbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5ff7fb76cbaea42348b63d23089e9e0549b19cbd commit 5ff7fb76cbaea42348b63d23089e9e0549b19cbd Author: Mateusz Guzik AuthorDate: 2023-02-24 19:18:11 +0000 Commit: Mateusz Guzik CommitDate: 2023-02-26 13:44:56 +0000 nfs: patch up MNT_LAZY on sync It is a de facto noop, just make it less costly. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D38763 --- sys/fs/nfsclient/nfs_clvfsops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 7635835ef0e0..efc92f6e7e19 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -1918,14 +1918,16 @@ nfs_sync(struct mount *mp, int waitfor) } MNT_IUNLOCK(mp); + if (waitfor == MNT_LAZY) + return (0); + /* * Force stale buffer cache information to be flushed. */ loop: MNT_VNODE_FOREACH_ALL(vp, mp, mvp) { /* XXX Racy bv_cnt check. */ - if (NFSVOPISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0 || - waitfor == MNT_LAZY) { + if (NFSVOPISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0) { VI_UNLOCK(vp); continue; }