diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
| commit | ab6652524aaf834d5dcdb46dd7695813b8d63da5 (patch) | |
| tree | bb3876a9b61254be902416f7dbf578deb28e9f22 /fs/Kconfig | |
| parent | acfcbaf1925f2dc5c46c61de69d756dec92a2ff8 (diff) | |
| parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
| download | linux-ab6652524aaf834d5dcdb46dd7695813b8d63da5.tar.gz linux-ab6652524aaf834d5dcdb46dd7695813b8d63da5.tar.bz2 linux-ab6652524aaf834d5dcdb46dd7695813b8d63da5.zip | |
Orangefs: merge to v4.5
Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.5
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 916d8348705b..922893f8ab4a 100644 --- 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" |