From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Wed, 11 Jan 2017 21:41:34 +0000 (-0500)
Subject: NFS: No need to set and return status in nfs41_lock_expired()
X-Git-Tag: v4.11-rc1~33^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b68de493a3c60517ef0435d2635b531ed590b9;p=thirdparty%2Flinux.git

NFS: No need to set and return status in nfs41_lock_expired()

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6c40944cb83de..81390e97c8d50 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