NFS: Deletion of unnecessary checks before the function call "nfs_put_client"

The nfs_put_client() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

2 files changed, 6 insertions, 12 deletions

diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c
index 9bb806a76d99..bfecac781f19 100644
--- a/fs/nfs/filelayout/filelayoutdev.c
+++ b/fs/nfs/filelayout/filelayoutdev.c
@@ -204,8 +204,7 @@ destroy_ds(struct nfs4_pnfs_ds *ds)
         ifdebug(FACILITY)
                 print_ds(ds);
 
-        if (ds->ds_clp)
-                nfs_put_client(ds->ds_clp);
+        nfs_put_client(ds->ds_clp);
 
         while (!list_empty(&ds->ds_addrs)) {
                 da = list_first_entry(&ds->ds_addrs,
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index ffdb28d86cf8..5f07a0ed9188 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -498,8 +498,7 @@ int nfs40_walk_client_list(struct nfs_client *new,
                         atomic_inc(&pos->cl_count);
                         spin_unlock(&nn->nfs_client_lock);
 
-                        if (prev)
-                                nfs_put_client(prev);
+                        nfs_put_client(prev);
                         prev = pos;
 
                         status = nfs_wait_client_init_complete(pos);
@@ -517,8 +516,7 @@ int nfs40_walk_client_list(struct nfs_client *new,
                 atomic_inc(&pos->cl_count);
                 spin_unlock(&nn->nfs_client_lock);
 
-                if (prev)
-                        nfs_put_client(prev);
+                nfs_put_client(prev);
                 prev = pos;
 
                 status = nfs4_proc_setclientid_confirm(pos, &clid, cred);
@@ -549,8 +547,7 @@ int nfs40_walk_client_list(struct nfs_client *new,
 
         /* No match found. The server lost our clientid */
 out:
-        if (prev)
-                nfs_put_client(prev);
+        nfs_put_client(prev);
         dprintk("NFS: <-- %s status = %d\n", __func__, status);
         return status;
 }
@@ -641,8 +638,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
                         atomic_inc(&pos->cl_count);
                         spin_unlock(&nn->nfs_client_lock);
 
-                        if (prev)
-                                nfs_put_client(prev);
+                        nfs_put_client(prev);
                         prev = pos;
 
                         status = nfs_wait_client_init_complete(pos);
@@ -675,8 +671,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
         /* No matching nfs_client found. */
         spin_unlock(&nn->nfs_client_lock);
         dprintk("NFS: <-- %s status = %d\n", __func__, status);
-        if (prev)
-                nfs_put_client(prev);
+        nfs_put_client(prev);
         return status;
 }
 #endif  /* CONFIG_NFS_V4_1 */