X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_namespace.c;h=cbac028098e5ee786c90edfb08a3886a459e1749;hp=6781598e91810ad2db6e94fce689d6dd0d4e2f55;hb=fdda2ad13bf014ec7e492bda3b8276dfd85fcd6d;hpb=6c47e7f99f5fa8884751ac549a45dd3c0b81e7f1;ds=sidebyside

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index 6781598..cbac028 100644
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -5544,7 +5544,8 @@ out:
 			break;
 		}
 
-		if (count == 1 && S_ISREG(lfsck_object_type(obj)))
+		if (obj != NULL && count == 1 &&
+		    S_ISREG(lfsck_object_type(obj)))
 			dt_attr_get(env, obj, la);
 	}
 
@@ -5566,15 +5567,14 @@ trace:
 		if (!(bk->lb_param & LPF_FAILOUT))
 			rc = 0;
 	} else {
-		if (log)
-			CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
-			       "repaired the entry: "DFID", parent "DFID
-			       ", name %.*s\n", lfsck_lfsck2name(lfsck),
-			       PFID(&lnr->lnr_fid), PFID(pfid),
-			       lnr->lnr_namelen, lnr->lnr_name);
-
 		if (repaired) {
 			ns->ln_items_repaired++;
+			if (log)
+				CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
+				       "repaired the entry: "DFID", parent "DFID
+				       ", name %.*s\n", lfsck_lfsck2name(lfsck),
+				       PFID(&lnr->lnr_fid), PFID(pfid),
+				       lnr->lnr_namelen, lnr->lnr_name);
 
 			switch (type) {
 			case LNIT_DANGLING:
@@ -5601,8 +5601,17 @@ trace:
 			ns->ln_name_hash_repaired++;
 
 			/* Not count repeatedly. */
-			if (!repaired)
+			if (!repaired) {
 				ns->ln_items_repaired++;
+				if (log)
+					CDEBUG(D_LFSCK, "%s: namespace LFSCK "
+					       "assistant repaired the entry: "
+					       DFID", parent "DFID
+					       ", name %.*s\n",
+					       lfsck_lfsck2name(lfsck),
+					       PFID(&lnr->lnr_fid), PFID(pfid),
+					       lnr->lnr_namelen, lnr->lnr_name);
+			}
 
 			if (bk->lb_param & LPF_DRYRUN &&
 			    lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))