ceph, rbd: delete unnecessary checks before two function calls

The functions ceph_put_snap_context() and iput() test whether their
argument is NULL and then return 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>
[idryomov@redhat.com: squashed rbd.c hunk, changelog]
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 27b71a0b72d0959e63fe2ea3efaeaaaa627a4e5d..3c34ab55537c581927e96ccaf8fa092143b605b2 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3405,8 +3405,7 @@ err_rq:
        if (result)
                rbd_warn(rbd_dev, "%s %llx at %llx result %d",
                         obj_op_name(op_type), length, offset, result);
-       if (snapc)
-               ceph_put_snap_context(snapc);
+       ceph_put_snap_context(snapc);
        blk_end_request_all(rq, result);
 }
 

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index cefca661464b91a4edae048a8567e900d8560df6..eb1bf1f35e0e90355f98037594f366716338a25d 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -3137,8 +3137,7 @@ flush_cap_releases:
 done:
        mutex_unlock(&session->s_mutex);
 done_unlocked:
-       if (inode)
-               iput(inode);
+       iput(inode);
        return;
 
 bad:

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 5a47ed760e6d4e6bd78ecdb19bf945edc1935f1d..fc74617069a3310d8f7914845924964ed2c98385 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -524,8 +524,7 @@ void ceph_mdsc_release_request(struct kref *kref)
        }
        if (req->r_locked_dir)
                ceph_put_cap_refs(ceph_inode(req->r_locked_dir), CEPH_CAP_PIN);
-       if (req->r_target_inode)
-               iput(req->r_target_inode);
+       iput(req->r_target_inode);
        if (req->r_dentry)
                dput(req->r_dentry);
        if (req->r_old_dentry)
@@ -1066,8 +1065,7 @@ out:
        session->s_cap_iterator = NULL;
        spin_unlock(&session->s_cap_lock);
 
-       if (last_inode)
-               iput(last_inode);
+       iput(last_inode);
        if (old_cap)
                ceph_put_cap(session->s_mdsc, old_cap);
 

diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index f01645a27752bfcde801206538728c90463a1e0d..c1cc993225e3e31d536ea5a2d5f61034763ba836 100644 (file)
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -365,8 +365,7 @@ static int build_snap_context(struct ceph_snap_realm *realm)
             realm->ino, realm, snapc, snapc->seq,
             (unsigned int) snapc->num_snaps);
 
-       if (realm->cached_context)
-               ceph_put_snap_context(realm->cached_context);
+       ceph_put_snap_context(realm->cached_context);
        realm->cached_context = snapc;
        return 0;
 
@@ -590,15 +589,13 @@ static void queue_realm_cap_snaps(struct ceph_snap_realm *realm)
                if (!inode)
                        continue;
                spin_unlock(&realm->inodes_with_caps_lock);
-               if (lastinode)
-                       iput(lastinode);
+               iput(lastinode);
                lastinode = inode;
                ceph_queue_cap_snap(ci);
                spin_lock(&realm->inodes_with_caps_lock);
        }
        spin_unlock(&realm->inodes_with_caps_lock);
-       if (lastinode)
-               iput(lastinode);
+       iput(lastinode);
 
        list_for_each_entry(child, &realm->children, child_item) {
                dout("queue_realm_cap_snaps %p %llx queue child %p %llx\n",