summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-10-26 22:55:40 +0200
committerArnd Bergmann <arnd@arndb.de>2010-10-27 21:39:39 +0200
commit763641d81202834e9d64de2019d1edec12868f4f (patch)
treecabbf932e3f6676bfbce6be27744795700011bfb /fs/nfsd
parentf9ba5375a8aae4aeea6be15df77e24707a429812 (diff)
downloadlinux-3.10-763641d81202834e9d64de2019d1edec12868f4f.tar.gz
linux-3.10-763641d81202834e9d64de2019d1edec12868f4f.tar.bz2
linux-3.10-763641d81202834e9d64de2019d1edec12868f4f.zip
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/nfsd')
-rw-r--r--fs/nfsd/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 31a78fce473..18b3e8975fe 100644
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -2,7 +2,6 @@ config NFSD
tristate "NFS server support"
depends on INET
depends on FILE_LOCKING
- depends on BKL # fix as soon as lockd is done
select LOCKD
select SUNRPC
select EXPORTFS