Orangefs: merge to v4.5

[cascardo/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 916d834..922893f 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,7 +50,8 @@ config FS_DAX_PMD
        bool
        default FS_DAX
        depends on FS_DAX
-       depends on BROKEN
+       depends on ZONE_DEVICE
+       depends on TRANSPARENT_HUGEPAGE
 
 endif # BLOCK
 
@@ -73,6 +74,16 @@ config FILE_LOCKING
           for filesystems like NFS and for the flock() system
           call. Disabling this option saves about 11k.
 
+config MANDATORY_FILE_LOCKING
+       bool "Enable Mandatory file locking"
+       depends on FILE_LOCKING
+       default y
+       help
+         This option enables files appropriately marked files on appropriely
+         mounted filesystems to support mandatory locking.
+
+         To the best of my knowledge this is dead code that no one cares about.
+
 source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"