diff options
Diffstat (limited to 'fs/afs/flock.c')
| -rw-r--r-- | fs/afs/flock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 0931bc1325eb..757d664575dd 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/smp_lock.h> | ||
| 13 | #include "internal.h" | 12 | #include "internal.h" |
| 14 | 13 | ||
| 15 | #define AFS_LOCK_GRANTED 0 | 14 | #define AFS_LOCK_GRANTED 0 |
| @@ -274,7 +273,7 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl) | |||
| 274 | 273 | ||
| 275 | type = (fl->fl_type == F_RDLCK) ? AFS_LOCK_READ : AFS_LOCK_WRITE; | 274 | type = (fl->fl_type == F_RDLCK) ? AFS_LOCK_READ : AFS_LOCK_WRITE; |
| 276 | 275 | ||
| 277 | lock_kernel(); | 276 | lock_flocks(); |
| 278 | 277 | ||
| 279 | /* make sure we've got a callback on this file and that our view of the | 278 | /* make sure we've got a callback on this file and that our view of the |
| 280 | * data version is up to date */ | 279 | * data version is up to date */ |
| @@ -421,7 +420,7 @@ given_lock: | |||
| 421 | afs_vnode_fetch_status(vnode, NULL, key); | 420 | afs_vnode_fetch_status(vnode, NULL, key); |
| 422 | 421 | ||
| 423 | error: | 422 | error: |
| 424 | unlock_kernel(); | 423 | unlock_flocks(); |
| 425 | _leave(" = %d", ret); | 424 | _leave(" = %d", ret); |
| 426 | return ret; | 425 | return ret; |
| 427 | 426 | ||
