summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker2017-01-11 22:41:34 +0100
committerAnna Schumaker2017-01-30 19:14:50 +0100
commit81b68de493a3c60517ef0435d2635b531ed590b9 (patch)
tree8302bb17956d492a9a0e6e46cf953ffc31febe81
parentNFS: Remove unnecessary goto in nfs4_lookup_root_sec() (diff)
downloadkernel-qcow2-linux-81b68de493a3c60517ef0435d2635b531ed590b9.tar.gz
kernel-qcow2-linux-81b68de493a3c60517ef0435d2635b531ed590b9.tar.xz
kernel-qcow2-linux-81b68de493a3c60517ef0435d2635b531ed590b9.zip
NFS: No need to set and return status in nfs41_lock_expired()
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6c40944cb83d..81390e97c8d5 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6282,8 +6282,7 @@ static int nfs41_lock_expired(struct nfs4_state *state, struct file_lock *reques
if (test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags) ||
test_bit(NFS_LOCK_LOST, &lsp->ls_flags))
return 0;
- status = nfs4_lock_expired(state, request);
- return status;
+ return nfs4_lock_expired(state, request);
}
#endif