b=10595

	r=adilger, nathan
Description: Error Message improvement patch (error_07.patch)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ee4ec09..8259078 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -50,6 +50,10 @@ Bugzilla   : 12769
 Description: Add sync option to mount_lustre.c
 Details    : Client loses data written to lustre after a network interruption.
 
+Severity   : normal
+Bugzilla   : 10595
+Description: Error message improvement.
+Details    : Merging of two LCONSOLE_ERROR_MSG into one.
 --------------------------------------------------------------------------------
 
 2007-07-30         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index f4fe219..cfc8b97 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -420,13 +420,10 @@ static void ldlm_failed_ast(struct ldlm_lock *lock, int rc,
         struct ptlrpc_connection *conn = lock->l_export->exp_connection;
         char                     *str = libcfs_nid2str(conn->c_peer.nid);
 
-        LCONSOLE_ERROR_MSG(0x138, "A client on nid %s was evicted from "
-                           "service %s.\n", str, 
-                           lock->l_export->exp_obd->obd_name);
-
-        LCONSOLE_ERROR_MSG(0x012, "Lock %s callback to %s timed out for "
-                           "resource %d\n", ast_type, 
-                           obd_export_nid2str(lock->l_export), rc);
+        LCONSOLE_ERROR_MSG(0x138, "%s: A client on nid %s was evicted due "
+                             "to a lock %s callback to %s timed out: rc %d\n",
+                             lock->l_export->exp_obd->obd_name, str, 
+                             ast_type, obd_export_nid2str(lock->l_export), rc);
 
         if (obd_dump_on_timeout)
                 libcfs_debug_dumplog();