X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_scrub.c;h=dfdd87c40ec6336f68624d49d682b2cfe728352f;hp=9ac3fcaf4a01f276b2428b2517a59824059feb9d;hb=f843facff59226d3788d855d1d6948523ab8d944;hpb=c2134f1e55150c6f7add284d8bf3c32a445ab235

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 9ac3fca..dfdd87c 100644
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -2388,32 +2388,28 @@ osd_ios_OBJECTS_scan(struct osd_thread_info *info, struct osd_device *dev,
 	}
 
 	child = osd_ios_lookup_one_len(ADMIN_USR, dentry, strlen(ADMIN_USR));
-	if (!IS_ERR(child)) {
+	if (IS_ERR(child)) {
+		rc = PTR_ERR(child);
+	} else {
 		rc = osd_ios_scan_one(info, dev, dentry->d_inode,
 				      child->d_inode, NULL, ADMIN_USR,
 				      strlen(ADMIN_USR), 0);
 		dput(child);
-	} else {
-		rc = PTR_ERR(child);
 	}
 
 	if (rc != 0 && rc != -ENOENT)
-		RETURN(rc);
+		GOTO(out, rc);
 
 	child = osd_ios_lookup_one_len(ADMIN_GRP, dentry, strlen(ADMIN_GRP));
-	if (!IS_ERR(child)) {
-		rc = osd_ios_scan_one(info, dev, dentry->d_inode,
-				      child->d_inode, NULL, ADMIN_GRP,
-				      strlen(ADMIN_GRP), 0);
-		dput(child);
-	} else {
-		rc = PTR_ERR(child);
-	}
-
-	if (rc == -ENOENT)
-		rc = 0;
+	if (IS_ERR(child))
+		GOTO(out, rc = PTR_ERR(child));
 
-	RETURN(rc);
+	rc = osd_ios_scan_one(info, dev, dentry->d_inode,
+			      child->d_inode, NULL, ADMIN_GRP,
+			      strlen(ADMIN_GRP), 0);
+	dput(child);
+out:
+	RETURN(rc == -ENOENT ? 0 : rc);
 }
 
 static void osd_initial_OI_scrub(struct osd_thread_info *info,