git: ff4196ad0bb2 - stable/13 - mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=ff4196ad0bb25c8bfababd6e1ee31362aef92283

commit ff4196ad0bb25c8bfababd6e1ee31362aef92283
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-03-08 18:26:48 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-03-13 00:31:20 +0000

    mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes
    
    (cherry picked from commit 4a2a69c4472cf677f8dfc026fff3dd33c83580cb)
---
 sbin/mount_nullfs/mount_nullfs.8 | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index d515decff211..fc33e64e2902 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -32,7 +32,7 @@
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
 .\"
-.Dd December 19, 2022
+.Dd March 24, 2024
 .Dt MOUNT_NULLFS 8
 .Os
 .Sh NAME
@@ -90,8 +90,34 @@ flag followed by a comma separated string of options.
 See the
 .Xr mount 8
 man page for possible options and their meanings.
+<<<<<<< HEAD
+||||||| parent of 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes)
+Additionally the following option is supported:
+.Bl -tag -width indent
+.It Cm nocache
+Disable metadata caching in the null layer.
+Some lower-layer file systems may force this option.
+Depending on the access pattern,
+this may result in increased lock contention.
+.El
+=======
+Additionally the following option is supported:
+.Bl -tag -width nocache
+.It Cm nocache
+Disable metadata caching in the null layer.
+Some lower-layer file systems may force this option.
+Depending on the access pattern,
+this may result in increased lock contention.
+.It Cm cache
+Force enable metadate caching.
+.El
+>>>>>>> 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes)
 .El
 .Pp
+The
+.Dv vfs.nullfs.cache_vnodes
+sysctl specifies global default for mount-specific cache/nocache option.
+.Pp
 The null layer has two purposes.
 First, it serves as a demonstration of layering by providing a layer
 which does nothing.