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

Commit 75eb3592 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: remove useless IS_ERR checks 



ceph_lookup_snap_realm either returns a valid pointer or NULL; there is no
need to check IS_ERR(result).

Reported-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 32c895e7

fs/ceph/snap.c

+0 −10
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ static int adjust_snap_realm_parent(struct ceph_mds_client *mdsc, 
		return 0;



	parent = ceph_lookup_snap_realm(mdsc, parentino);

	if (IS_ERR(parent))

		return PTR_ERR(parent);

	if (!parent) {

		parent = ceph_create_snap_realm(mdsc, parentino);

		if (IS_ERR(parent))
@@ -541,10 +539,6 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, 
	p += sizeof(u64) * le32_to_cpu(ri->num_prior_parent_snaps);



	realm = ceph_lookup_snap_realm(mdsc, le64_to_cpu(ri->ino));

	if (IS_ERR(realm)) {

		err = PTR_ERR(realm);

		goto fail;

	}

	if (!realm) {

		realm = ceph_create_snap_realm(mdsc, le64_to_cpu(ri->ino));

		if (IS_ERR(realm)) {
@@ -762,8 +756,6 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc, 
		ri = p;



		realm = ceph_lookup_snap_realm(mdsc, split);

		if (IS_ERR(realm))

			goto out;

		if (!realm) {

			realm = ceph_create_snap_realm(mdsc, split);

			if (IS_ERR(realm))
@@ -829,8 +821,6 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc, 
			struct ceph_snap_realm *child =

				ceph_lookup_snap_realm(mdsc,

					   le64_to_cpu(split_realms[i]));

			if (IS_ERR(child))

				continue;

			if (!child)

				continue;

			adjust_snap_realm_parent(mdsc, child, realm->ino);