jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 04:53:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stable/13 sbin/mount_nullfs: Resolve conlict in man page

Browse Source 
Reported by:	Seigo Tanimura <seigo.tanimura@gmail.com>
Pointy hat to:	kib
This commit is contained in:
Konstantin Belousov 2024-03-15 12:10:46 +02:00
parent 6bf21b4c0c
commit e1341e5318
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/mount_nullfs/mount_nullfs.8
View File

@ -90,17 +90,6 @@ 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
@ -111,7 +100,6 @@ this may result in increased lock contention.
.It Cm cache
Force enable metadata caching.
.El
>>>>>>> 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes)
.El
.Pp
The