diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-10-26 16:55:40 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-27 15:39:39 -0400 |
| commit | 763641d81202834e9d64de2019d1edec12868f4f (patch) | |
| tree | cabbf932e3f6676bfbce6be27744795700011bfb /fs/nfs | |
| parent | f9ba5375a8aae4aeea6be15df77e24707a429812 (diff) | |
lockd: push lock_flocks down
lockd should use lock_flocks() instead of lock_kernel()
to lock against posix locks accessing the i_flock list.
This is a prerequisite to turning lock_flocks into a
spinlock.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index fd667652c502..ba306658a6db 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | config NFS_FS | 1 | config NFS_FS |
| 2 | tristate "NFS client support" | 2 | tristate "NFS client support" |
| 3 | depends on INET && FILE_LOCKING | 3 | depends on INET && FILE_LOCKING |
| 4 | depends on BKL # fix as soon as lockd is done | ||
| 5 | select LOCKD | 4 | select LOCKD |
| 6 | select SUNRPC | 5 | select SUNRPC |
| 7 | select NFS_ACL_SUPPORT if NFS_V3_ACL | 6 | select NFS_ACL_SUPPORT if NFS_V3_ACL |