Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e96a650a authored by SF Markus Elfring's avatar SF Markus Elfring Committed by Ilya Dryomov
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
[idryomov@redhat.com: squashed rbd.c hunk, changelog]
Signed-off-by: default avatarIlya Dryomov <idryomov@redhat.com>
parent 70db4f36

drivers/block/rbd.c

+1 −2
Original line number Diff line number Diff line
@@ -3405,7 +3405,6 @@ static void rbd_handle_request(struct rbd_device *rbd_dev, struct request *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);

	blk_end_request_all(rq, result);

}

fs/ceph/caps.c

+1 −2
Original line number Diff line number Diff line
@@ -3137,7 +3137,6 @@ void ceph_handle_caps(struct ceph_mds_session *session, 
done:

	mutex_unlock(&session->s_mutex);

done_unlocked:

	if (inode)

	iput(inode);

	return;

fs/ceph/mds_client.c

+2 −4
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ 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);

	if (req->r_dentry)

		dput(req->r_dentry);
@@ -1066,7 +1065,6 @@ static int iterate_session_caps(struct ceph_mds_session *session, 
	session->s_cap_iterator = NULL;

	spin_unlock(&session->s_cap_lock);



	if (last_inode)

	iput(last_inode);

	if (old_cap)

		ceph_put_cap(session->s_mdsc, old_cap);

fs/ceph/snap.c

+3 −6
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ 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);

	realm->cached_context = snapc;

	return 0;
@@ -590,14 +589,12 @@ 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);

		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);



	list_for_each_entry(child, &realm->children, child_item) {