NFS: drop unneeded goto

Author: Julia Lawall <Julia.Lawall@lip6.fr>

Delete jump to a label on the next line, when that label is not
used elsewhere.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// 
@r@
identifier l;
@@

-if (...) goto l;
-l:
// 

Also drop the unnecessary ret variable.

Signed-off-by: Julia Lawall 
Signed-off-by: Trond Myklebust

---
 fs/nfs/nfs4idmap.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
 
diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c
index 2e1737c..535dfc6 100644
--- a/fs/nfs/nfs4idmap.c
+++ b/fs/nfs/nfs4idmap.c
@@ -494,12 +494,7 @@ nfs_idmap_delete(struct nfs_client *clp)
 
 int nfs_idmap_init(void)
 {
-	int ret;
-	ret = nfs_idmap_init_keyring();
-	if (ret != 0)
-		goto out;
-out:
-	return ret;
+	return nfs_idmap_init_keyring();
 }
 
 void nfs_idmap_quit(void)

NFS: drop unneeded goto

qlambert

Archives

Posts by Subject