Commit ff604066 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix typo in lock caching

 When caching locks due to holding a file delegation, we must always
 check against local locks before sending anything to the server.
Signed-off-by: default avatarTrond Myklebust <>
parent 36f20c6d
......@@ -3071,15 +3071,15 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock
struct nfs4_client *clp = state->owner->so_client;
int status;
/* Is this a delegated open? */
if (test_bit(NFS_DELEGATED_STATE, &state->flags)) {
if (NFS_I(state->inode)->delegation_state != 0) {
/* Yes: cache locks! */
status = do_vfs_lock(request->fl_file, request);
/* ...but avoid races with delegation recall... */
if (status < 0 || test_bit(NFS_DELEGATED_STATE, &state->flags))
goto out;
return status;
status = nfs4_set_lock_state(state, request);
if (status != 0)
goto out;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment