diff options
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r-- | fs/nfs/nfs4state.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 3e2f19b04c06..96524c5dca6b 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
42 | #include <linux/slab.h> | 42 | #include <linux/slab.h> |
43 | #include <linux/smp_lock.h> | 43 | #include <linux/fs.h> |
44 | #include <linux/nfs_fs.h> | 44 | #include <linux/nfs_fs.h> |
45 | #include <linux/nfs_idmap.h> | 45 | #include <linux/nfs_idmap.h> |
46 | #include <linux/kthread.h> | 46 | #include <linux/kthread.h> |
@@ -970,13 +970,13 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ | |||
970 | /* Guard against delegation returns and new lock/unlock calls */ | 970 | /* Guard against delegation returns and new lock/unlock calls */ |
971 | down_write(&nfsi->rwsem); | 971 | down_write(&nfsi->rwsem); |
972 | /* Protect inode->i_flock using the BKL */ | 972 | /* Protect inode->i_flock using the BKL */ |
973 | lock_kernel(); | 973 | lock_flocks(); |
974 | for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { | 974 | for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { |
975 | if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK))) | 975 | if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK))) |
976 | continue; | 976 | continue; |
977 | if (nfs_file_open_context(fl->fl_file)->state != state) | 977 | if (nfs_file_open_context(fl->fl_file)->state != state) |
978 | continue; | 978 | continue; |
979 | unlock_kernel(); | 979 | unlock_flocks(); |
980 | status = ops->recover_lock(state, fl); | 980 | status = ops->recover_lock(state, fl); |
981 | switch (status) { | 981 | switch (status) { |
982 | case 0: | 982 | case 0: |
@@ -1003,9 +1003,9 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ | |||
1003 | /* kill_proc(fl->fl_pid, SIGLOST, 1); */ | 1003 | /* kill_proc(fl->fl_pid, SIGLOST, 1); */ |
1004 | status = 0; | 1004 | status = 0; |
1005 | } | 1005 | } |
1006 | lock_kernel(); | 1006 | lock_flocks(); |
1007 | } | 1007 | } |
1008 | unlock_kernel(); | 1008 | unlock_flocks(); |
1009 | out: | 1009 | out: |
1010 | up_write(&nfsi->rwsem); | 1010 | up_write(&nfsi->rwsem); |
1011 | return status; | 1011 | return status; |