diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:13:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:13:34 -0400 |
| commit | 7420a8c0de8d99b201aeeab6fed16ca95ebf55a5 (patch) | |
| tree | 0787800f490f98ffd41b958e52ab15732335744e /fs/Kconfig | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff) | |
| parent | 72f98e72551fad573c6cace8e8551ef094f482dd (diff) | |
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
locks: turn lock_flocks into a spinlock
fasync: re-organize fasync entry insertion to allow it under a spinlock
locks/nfsd: allocate file lock outside of spinlock
lockd: fix nlmsvc_notify_blocked locking
lockd: push lock_flocks down
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index b5e582bd769d..97673c955484 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -53,7 +53,6 @@ config EXPORTFS | |||
| 53 | config FILE_LOCKING | 53 | config FILE_LOCKING |
| 54 | bool "Enable POSIX file locking API" if EMBEDDED | 54 | bool "Enable POSIX file locking API" if EMBEDDED |
| 55 | default y | 55 | default y |
| 56 | select BKL # while lockd still uses it. | ||
| 57 | help | 56 | help |
| 58 | This option enables standard file locking support, required | 57 | This option enables standard file locking support, required |
| 59 | for filesystems like NFS and for the flock() system | 58 | for filesystems like NFS and for the flock() system |