From nobody Thu Mar 14 00:46:00 2024 X-Original-To: dev-commits-src-branches@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 4Tw7wT0TSbz5DmwW; Thu, 14 Mar 2024 00:46: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 4Tw7wS73Wfz4G48; Thu, 14 Mar 2024 00:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710377161; 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=wg2gauSTfKrouZjk0lvMg/3bmPxY3P7vOPUU8DiOv6I=; b=FiBpq0OtOBqit5ApqfIgU+XzkazkUoagCH5AR/i0/qxyglOHffXN8ImkACIuPe31ahxZdS W4+9s6vqOYZVdeDj90x6pnXi4Fx1qDGoTz+xiJ5vJfmkjZbkLjofWqXXfWOzZAmKkBB6cU G5Z4Si0/do3+0rtdGs36nir4XMEMGvHs3J7aPZRpFSmfI++mts0sMmcxHPNcm2qaT95f+q SkXncj2Ne4e7qH/yuA4K5quXe7iD/U0a+uc9vEwl1HabDjKMWsatZ0BTjgKSTEWHK2xA3m y/1ULg20WB9i1ihREMgVNVtgYzmpeJSf3HV3oqZXd9nfX5/1z8qwJM/mzhjvNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710377161; a=rsa-sha256; cv=none; b=Gkzxd+R7MS1EnYG5zjkoGhhjenVC53c4gQKIwXEoI4Fe930N9m/XQnHQGYDNDiAX/xcX1b KfXJYNQVBkaqEQjF3waKCoTQ6pkxoF7aZuxUCuw1ZC+VDc2YzNuuP/x7DQfq+cwRiM6qG4 NP26af3OWJTxVEiq7jV/d0TvyXRb8/qCKTVtE1IILR/AZwgusGqE5AKVoz/05TiiMAvKm7 jM6DkRplyORCXRFdpyehMfRJ5Dkt25VHpaV8igMSdYsm5V+qfclHkYnSePXMV7+Hci/6Gi 6yVKhL4HxUd54rgBowL7s8uHxLJsG0MoRA+veYThCkwEH2biKA7YheEYevyz+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710377161; 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=wg2gauSTfKrouZjk0lvMg/3bmPxY3P7vOPUU8DiOv6I=; b=DJhyIoEOjI0CGj5zNCYcmaxcWcGgtQ/IgfWBh1j0aSiTviA5V7QPmuXvawCMVEvmSRCTq3 /TqvtV8isxK6joKW0vrFFQnpgbKzf5hNYKmgubRGEzLxLwIpGZAuWz2uJSY3egEdNFJcJn Fs48l7q2DU3xE/KvSmZy5wuoztVuh/JF/97nI+YVi8qR6qEAaZtEcZalzaq5u1anEnd8f7 5Q69TmlhtPL7gimSybQZHjW26QetHvWUAOVNYOVSPg93p8fRqyl1HwBosKpBadj+MzthUO LvuSH4v9rqFlmu2v/Hy+LJdkQyeZ8yHUEVuL3rD9mjOvvJlQHFWHW/kcFq6phA== 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 4Tw7wS6gYgz14yv; Thu, 14 Mar 2024 00:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42E0k0VJ028652; Thu, 14 Mar 2024 00:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42E0k0oJ028649; Thu, 14 Mar 2024 00:46:00 GMT (envelope-from git) Date: Thu, 14 Mar 2024 00:46:00 GMT Message-Id: <202403140046.42E0k0oJ028649@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: adcb01c08e84 - stable/14 - nullfs: add -o cache List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/14 X-Git-Reftype: branch X-Git-Commit: adcb01c08e849bee32b10b214f59d6bcf8ea46ea Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=adcb01c08e849bee32b10b214f59d6bcf8ea46ea commit adcb01c08e849bee32b10b214f59d6bcf8ea46ea Author: Konstantin Belousov AuthorDate: 2024-03-08 18:26:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-13 00:30:41 +0000 nullfs: add -o cache (cherry picked from commit 8921216dbee6884532e22d5347cff4d9ed23e782) --- sys/fs/nullfs/null_vfsops.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index dde69d444923..3df24305f3ff 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -209,12 +209,15 @@ nullfs_mount(struct mount *mp) MNT_IUNLOCK(mp); } - xmp->nullm_flags |= NULLM_CACHE; - if (!null_cache_vnodes || - vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0 || - (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) != 0) - xmp->nullm_flags &= ~NULLM_CACHE; - + if (vfs_getopt(mp->mnt_optnew, "cache", NULL, NULL) == 0) { + xmp->nullm_flags |= NULLM_CACHE; + } else if (vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0) { + ; + } else if (null_cache_vnodes && + (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) == 0) { + xmp->nullm_flags |= NULLM_CACHE; + } + if ((xmp->nullm_flags & NULLM_CACHE) != 0) { vfs_register_for_notification(xmp->nullm_vfs, mp, &xmp->notify_node);