aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/mds_client.c
diff options
context:
space:
mode:
authorSF Markus Elfring <elfring@users.sourceforge.net>2014-11-02 09:20:59 -0500
committerIlya Dryomov <idryomov@redhat.com>2014-12-17 12:09:50 -0500
commite96a650a8174e20112b400e72e0b2429aa66de20 (patch)
tree44fa588afe9ee1b9504016e012c3dcffb184b87b /fs/ceph/mds_client.c
parent70db4f3629b3476cf506be869ef9d15688d2d44a (diff)
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>
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r--fs/ceph/mds_client.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 5a47ed760e6d..fc74617069a3 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -524,8 +524,7 @@ void ceph_mdsc_release_request(struct kref *kref)
524 } 524 }
525 if (req->r_locked_dir) 525 if (req->r_locked_dir)
526 ceph_put_cap_refs(ceph_inode(req->r_locked_dir), CEPH_CAP_PIN); 526 ceph_put_cap_refs(ceph_inode(req->r_locked_dir), CEPH_CAP_PIN);
527 if (req->r_target_inode) 527 iput(req->r_target_inode);
528 iput(req->r_target_inode);
529 if (req->r_dentry) 528 if (req->r_dentry)
530 dput(req->r_dentry); 529 dput(req->r_dentry);
531 if (req->r_old_dentry) 530 if (req->r_old_dentry)
@@ -1066,8 +1065,7 @@ out:
1066 session->s_cap_iterator = NULL; 1065 session->s_cap_iterator = NULL;
1067 spin_unlock(&session->s_cap_lock); 1066 spin_unlock(&session->s_cap_lock);
1068 1067
1069 if (last_inode) 1068 iput(last_inode);
1070 iput(last_inode);
1071 if (old_cap) 1069 if (old_cap)
1072 ceph_put_cap(session->s_mdsc, old_cap); 1070 ceph_put_cap(session->s_mdsc, old_cap);
1073 1071