diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c08c46a3b8cd..be5a8f84e5bb 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -6372,7 +6372,7 @@ struct nfs4_lock_waiter { | |||
6372 | }; | 6372 | }; |
6373 | 6373 | ||
6374 | static int | 6374 | static int |
6375 | nfs4_wake_lock_waiter(wait_queue_t *wait, unsigned int mode, int flags, void *key) | 6375 | nfs4_wake_lock_waiter(wait_queue_entry_t *wait, unsigned int mode, int flags, void *key) |
6376 | { | 6376 | { |
6377 | int ret; | 6377 | int ret; |
6378 | struct cb_notify_lock_args *cbnl = key; | 6378 | struct cb_notify_lock_args *cbnl = key; |
@@ -6415,7 +6415,7 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) | |||
6415 | .inode = state->inode, | 6415 | .inode = state->inode, |
6416 | .owner = &owner, | 6416 | .owner = &owner, |
6417 | .notified = false }; | 6417 | .notified = false }; |
6418 | wait_queue_t wait; | 6418 | wait_queue_entry_t wait; |
6419 | 6419 | ||
6420 | /* Don't bother with waitqueue if we don't expect a callback */ | 6420 | /* Don't bother with waitqueue if we don't expect a callback */ |
6421 | if (!test_bit(NFS_STATE_MAY_NOTIFY_LOCK, &state->flags)) | 6421 | if (!test_bit(NFS_STATE_MAY_NOTIFY_LOCK, &state->flags)) |