From 6497095a8812c3461f7854fcdbe03d00b56a9c25 Mon Sep 17 00:00:00 2001 From: vitaly Date: Wed, 13 Jun 2007 12:06:21 +0000 Subject: [PATCH] Branch b1_6 the build is broken with last commits. fixing --- lustre/include/lustre_net.h | 1 + lustre/mgs/mgs_llog.c | 6 +++--- lustre/ptlrpc/import.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index e6e7d21..dccf83e 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -869,6 +869,7 @@ int ptlrpcd_addref(void); void ptlrpcd_decref(void); /* ptlrpc/lproc_ptlrpc.c */ +const char* ll_opcode2str(__u32 opcode); #ifdef LPROCFS void ptlrpc_lprocfs_register_obd(struct obd_device *obd); void ptlrpc_lprocfs_unregister_obd(struct obd_device *obd); diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index d20be98..8688e28 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -1415,9 +1415,9 @@ static int mgs_write_log_params(struct obd_device *obd, struct fs_db *fsdb, /* Processed in mgs_write_log_ost */ if (class_match_param(ptr, PARAM_FAILMODE, NULL) == 0) { if (mti->mti_flags & LDD_F_PARAM) { - LCONSOLE_ERROR("%s can only be changed with " - "tunefs.lustre and --writeconf\n", - ptr); + LCONSOLE_ERROR(0x169, "%s can only be changed " + "with tunefs.lustre and " + "--writeconf\n", ptr); rc = -EPERM; } goto end_while; diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index baf7058..3ccfdfd 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -759,7 +759,8 @@ finish: /* Actually servers are only supposed to refuse connection from liblustre clients, so we should never see this from VFS context */ - LCONSOLE_ERROR("Server %s version (%d.%d.%d.%d)" + LCONSOLE_ERROR(0x16a, "Server %s version " + "(%d.%d.%d.%d)" " refused connection from this client " "with an incompatible version (%s). " "Client must be recompiled\n", -- 1.8.3.1