X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_bookmark.c;h=0036522abd358c07411a4543980bf7cbc8e13811;hp=cf31418b8ef6f0549c585faff7f24809d06f3e6b;hb=98d88213b8adde7cfa4a3b7aa1ff65e17e7e93a9;hpb=4c4f74b0a581e139f3bf3db1a41d2b11594c039f

diff --git a/lustre/lfsck/lfsck_bookmark.c b/lustre/lfsck/lfsck_bookmark.c
index cf31418..0036522 100644
--- a/lustre/lfsck/lfsck_bookmark.c
+++ b/lustre/lfsck/lfsck_bookmark.c
@@ -80,9 +80,9 @@ static int lfsck_bookmark_load(const struct lu_env *env,
 
 		lfsck_bookmark_le_to_cpu(bm, &lfsck->li_bookmark_disk);
 		if (bm->lb_magic != LFSCK_BOOKMARK_MAGIC) {
-			CWARN("%s: invalid lfsck_bookmark magic %#x != %#x\n",
-			      lfsck_lfsck2name(lfsck), bm->lb_magic,
-			      LFSCK_BOOKMARK_MAGIC);
+			CDEBUG(D_LFSCK, "%s: invalid lfsck_bookmark magic "
+			      "%#x != %#x\n", lfsck_lfsck2name(lfsck),
+			      bm->lb_magic, LFSCK_BOOKMARK_MAGIC);
 			/* Process it as new lfsck_bookmark. */
 			rc = -ENODATA;
 		}
@@ -91,8 +91,8 @@ static int lfsck_bookmark_load(const struct lu_env *env,
 			/* return -ENODATA for empty lfsck_bookmark. */
 			rc = -ENODATA;
 		else
-			CERROR("%s: fail to load lfsck_bookmark: "
-			       "expected = %d, rc = %d\n",
+			CDEBUG(D_LFSCK, "%s: fail to load lfsck_bookmark, "
+			       "expected = %d: rc = %d\n",
 			       lfsck_lfsck2name(lfsck), len, rc);
 	}
 	return rc;
@@ -110,41 +110,33 @@ int lfsck_bookmark_store(const struct lu_env *env, struct lfsck_instance *lfsck)
 	lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk,
 				 &lfsck->li_bookmark_ram);
 	handle = dt_trans_create(env, lfsck->li_bottom);
-	if (IS_ERR(handle)) {
-		rc = PTR_ERR(handle);
-		CERROR("%s: fail to create trans for storing lfsck_bookmark: "
-		       "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
-		RETURN(rc);
-	}
+	if (IS_ERR(handle))
+		GOTO(log, rc = PTR_ERR(handle));
 
 	rc = dt_declare_record_write(env, obj,
 				     lfsck_buf_get(env,
 				     &lfsck->li_bookmark_disk, len),
 				     0, handle);
-	if (rc != 0) {
-		CERROR("%s: fail to declare trans for storing lfsck_bookmark: "
-		       "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+	if (rc != 0)
 		GOTO(out, rc);
-	}
 
 	rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
-	if (rc != 0) {
-		CERROR("%s: fail to start trans for storing lfsck_bookmark: "
-		       "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+	if (rc != 0)
 		GOTO(out, rc);
-	}
 
 	rc = dt_record_write(env, obj,
 			     lfsck_buf_get(env, &lfsck->li_bookmark_disk, len),
 			     &pos, handle);
-	if (rc != 0)
-		CERROR("%s: fail to store lfsck_bookmark: expected = %d, "
-		       "rc = %d\n", lfsck_lfsck2name(lfsck), len, rc);
 
 	GOTO(out, rc);
 
 out:
 	dt_trans_stop(env, lfsck->li_bottom, handle);
+
+log:
+	if (rc != 0)
+		CDEBUG(D_LFSCK, "%s: fail to store lfsck_bookmark: rc = %d\n",
+		       lfsck_lfsck2name(lfsck), rc);
 	return rc;
 }
 
@@ -322,4 +314,3 @@ int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
 
 	return rc;
 }
-