diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 15:46:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 15:46:17 -0800 |
| commit | 065019a38feab5f2659cbd44080d528f8dff0b00 (patch) | |
| tree | 80e8fcd6fea433ba9ddd3a3ba9333446947be78f /fs/Kconfig | |
| parent | 4f31d774dd5239e563f22ffe1403292414e6f779 (diff) | |
| parent | b4d629a39e104a8326d5b281ce07c21240c130c9 (diff) | |
| download | linux-065019a38feab5f2659cbd44080d528f8dff0b00.tar.gz linux-065019a38feab5f2659cbd44080d528f8dff0b00.tar.bz2 linux-065019a38feab5f2659cbd44080d528f8dff0b00.zip | |
Merge tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux
Pull file locking updates from Jeff Layton:
"File locking related changes for v4.5 (pile #1)
Highlights:
- new Kconfig option to allow disabling mandatory locking (which is
racy anyway)
- new tracepoints for setlk and close codepaths
- fix for a long-standing bug in code that handles races between
setting a POSIX lock and close()"
* tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux:
locks: rename __posix_lock_file to posix_lock_inode
locks: prink more detail when there are leaked locks
locks: pass inode pointer to locks_free_lock_context
locks: sprinkle some tracepoints around the file locking code
locks: don't check for race with close when setting OFD lock
locks: fix unlock when fcntl_setlk races with a close
fs: make locks.c explicitly non-modular
locks: use list_first_entry_or_null()
locks: Don't allow mounts in user namespaces to enable mandatory locking
locks: Allow disabling mandatory locking at compile time
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 6ce72d8d1ee1..2bb1ef86c411 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -73,6 +73,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" |