diff options
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cf0d2ffb3c84..a7292fcf7718 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/file.h> | 35 | #include <linux/file.h> |
| 36 | #include <linux/smp_lock.h> | 36 | #include <linux/fs.h> |
| 37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
| 38 | #include <linux/namei.h> | 38 | #include <linux/namei.h> |
| 39 | #include <linux/swap.h> | 39 | #include <linux/swap.h> |
| @@ -3895,7 +3895,7 @@ check_for_locks(struct nfs4_file *filp, struct nfs4_stateowner *lowner) | |||
| 3895 | struct inode *inode = filp->fi_inode; | 3895 | struct inode *inode = filp->fi_inode; |
| 3896 | int status = 0; | 3896 | int status = 0; |
| 3897 | 3897 | ||
| 3898 | lock_kernel(); | 3898 | lock_flocks(); |
| 3899 | for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) { | 3899 | for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) { |
| 3900 | if ((*flpp)->fl_owner == (fl_owner_t)lowner) { | 3900 | if ((*flpp)->fl_owner == (fl_owner_t)lowner) { |
| 3901 | status = 1; | 3901 | status = 1; |
| @@ -3903,7 +3903,7 @@ check_for_locks(struct nfs4_file *filp, struct nfs4_stateowner *lowner) | |||
| 3903 | } | 3903 | } |
| 3904 | } | 3904 | } |
| 3905 | out: | 3905 | out: |
| 3906 | unlock_kernel(); | 3906 | unlock_flocks(); |
| 3907 | return status; | 3907 | return status; |
| 3908 | } | 3908 | } |
| 3909 | 3909 | ||
