Merge tag 'block-5.6-2020-02-22' of git://git.kernel.dk/linux-block

[linux.git] / fs / nfs / Kconfig

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 295a7a21b774401444fc96ad60a9a4fb53392ec5..40b6c5ac46c0cc17c621eddfa17ec7f514bdce88 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -90,7 +90,7 @@ config NFS_V4
 config NFS_SWAP
        bool "Provide swap over NFS support"
        default n
-       depends on NFS_FS
+       depends on NFS_FS && SWAP
        select SUNRPC_SWAP
        help
          This option enables swapon to work on files located on NFS mounts.
@@ -196,3 +196,12 @@ config NFS_DEBUG
        depends on NFS_FS && SUNRPC_DEBUG
        select CRC32
        default y
+
+config NFS_DISABLE_UDP_SUPPORT
+       bool "NFS: Disable NFS UDP protocol support"
+       depends on NFS_FS
+       default y
+       help
+        Choose Y here to disable the use of NFS over UDP. NFS over UDP
+        on modern networks (1Gb+) can lead to data corruption caused by
+        fragmentation during high loads.