Merge tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f65b9599322854587b9d8ff06b32124a569da9e8..9725c546a0d46db7eda7b138f34511af5558d453 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3253,6 +3253,19 @@
                        driver. A non-zero value sets the minimum interval
                        in seconds between layoutstats transmissions.
 
+       nfsd.inter_copy_offload_enable =
+                       [NFSv4.2] When set to 1, the server will support
+                       server-to-server copies for which this server is
+                       the destination of the copy.
+
+       nfsd.nfsd4_ssc_umount_timeout =
+                       [NFSv4.2] When used as the destination of a
+                       server-to-server copy, knfsd temporarily mounts
+                       the source server.  It caches the mount in case
+                       it will be needed again, and discards it if not
+                       used for the number of milliseconds specified by
+                       this parameter.
+
        nfsd.nfs4_disable_idmapping=
                        [NFSv4] When set to the default of '1', the NFSv4
                        server will return only numeric uids and gids to
@@ -3260,6 +3273,7 @@
                        and gids from such clients.  This is intended to ease
                        migration from NFSv2/v3.
 
+
        nmi_backtrace.backtrace_idle [KNL]
                        Dump stacks even of idle CPUs in response to an
                        NMI stack-backtrace request.