From: ericm <ericm>
Date: Fri, 10 Oct 2003 09:31:55 +0000 (+0000)
Subject: merge b_devel to b_eq: 20031010
X-Git-Tag: v1_7_100~1^36~32
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a318249b269858a6fcbab43a4498d342c3063ea0;p=fs%2Flustre-release.git

merge b_devel to b_eq: 20031010
kernel only
---

diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index 3ce4b67..2734990 100644
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -75,7 +75,7 @@ struct ll_rpc_opcode {
         { PTLBD_CONNECT,    "ptlbd_connect" },
         { PTLBD_DISCONNECT, "ptlbd_disconnect" },
         { OBD_PING,         "obd_ping" },
-        { OBD_LOG_CANCEL,   "obd_log_cancel" },
+        { OBD_LOG_CANCEL,   "llog_origin_handle_cancel"},
 };
 
 const char* ll_opcode2str(__u32 opcode)