From: Andreas Dilger Date: Fri, 10 May 2013 04:52:01 +0000 (-0600) Subject: LU-1095 debug: clean up console messages X-Git-Tag: 2.5.54~5 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6c5e48383bc10dc0a798b56c898e5a90293246b6 LU-1095 debug: clean up console messages Clean up overly verbose console error messages, improve others. Signed-off-by: Andreas Dilger Change-Id: I480d61dd6febb81ca58709ff939a7807bc3ebbe5 Reviewed-on: http://review.whamcloud.com/8617 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Faccini Bruno Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 1056a83..3798225 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -1041,10 +1041,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) cfg->cfg_callback = class_config_llog_handler; /* set up client obds */ err = lustre_process_log(sb, profilenm, cfg); - if (err < 0) { - CERROR("Unable to process log: %d\n", err); - GOTO(out_free, err); - } + if (err < 0) + GOTO(out_free, err); /* Profile set with LCFG_MOUNTOPT so we can find our mdc and osc obds */ lprof = class_get_profile(profilenm); diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 309080e..0fa0463 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -106,8 +106,7 @@ int lustre_process_log(struct super_block *sb, char *logname, "client and the MGS are running compatible " "versions of Lustre.\n", mgc->obd_name, logname, rc); - - if (rc) + else if (rc != 0) LCONSOLE_ERROR_MSG(0x15c, "%s: The configuration from log '%s' " "failed (%d). This may be the result of " "communication errors between this node and " diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c index 14a474f..5a837a6 100644 --- a/lustre/target/tgt_handler.c +++ b/lustre/target/tgt_handler.c @@ -1180,8 +1180,11 @@ int tgt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, rc = tgt_sync(&env, tgt, obj); if (rc < 0) { - CERROR("%s: sync failed on lock cancel: rc = %d\n", - tgt_name(tgt), rc); + CERROR("%s: syncing "DFID" ("LPU64"-"LPU64") on lock " + "cancel: rc = %d\n", + tgt_name(tgt), PFID(&fid), + lock->l_policy_data.l_extent.start, + lock->l_policy_data.l_extent.end, rc); } err_put: lu_object_put(&env, &obj->do_lu);