From: Sage Weil <sage@newdream.net>
Date: Sat, 21 Nov 2009 21:08:14 +0000 (-0800)
Subject: ceph: remove useless IS_ERR checks
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75eb3592811028e5b01835126483d115532a3aa1;p=linux-beck.git

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: Julia Lawall <julia@diku.dk>
Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index 2e3cb40b7e48..52f46a1208f5 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -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 @@ more:
 	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 @@ skip_inode:
 			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);