From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Wed, 11 Jan 2017 21:30:08 +0000 (-0500)
Subject: NFS: Remove unnecessary goto in nfs4_lookup_root_sec()
X-Git-Tag: v4.11-rc1~33^2~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9df1336ca42c16622f1cae5dff246a0c9c644514;p=karo-tx-linux.git

NFS: Remove unnecessary goto in nfs4_lookup_root_sec()

Once again, it's easier and cleaner just to return the error directly.

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index baf968990475..6c40944cb83d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3416,16 +3416,11 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
 		.pseudoflavor = flavor,
 	};
 	struct rpc_auth *auth;
-	int ret;
 
 	auth = rpcauth_create(&auth_args, server->client);
-	if (IS_ERR(auth)) {
-		ret = -EACCES;
-		goto out;
-	}
-	ret = nfs4_lookup_root(server, fhandle, info);
-out:
-	return ret;
+	if (IS_ERR(auth))
+		return -EACCES;
+	return nfs4_lookup_root(server, fhandle, info);
 }
 
 /*