NFSv4: Fix error handling in nfs4_sp4_select_mode()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 2 Aug 2018 05:42:04 +0000 (05:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Sep 2018 07:45:30 +0000 (09:45 +0200)
[ Upstream commit 72bf75cfc00c02aa66ef6133048f37aa5d88825c ]

Error code is set in the error handling cases but never used. Fix it.

Fixes: 937e3133cd0b ("NFSv4.1: Ensure we clear the SP4_MACH_CRED flags in nfs4_sp4_select_mode()")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/nfs4proc.c

index dda4a3a3ef6e006141d129fd19492466c6422851..77c7d29fcd3b8d26c2eddf6c4ef521c80b0da5be 100644 (file)
@@ -7497,7 +7497,7 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp,
        }
 out:
        clp->cl_sp4_flags = flags;
-       return 0;
+       return ret;
 }
 
 struct nfs41_exchange_id_data {