From d22678dad183c98f78fe312f6f3bed1b7cae8535 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 19 Aug 2003 17:10:03 +0000 Subject: [PATCH] b=1505 Disable some console messages from failed statfs(), reconnect --- lustre/lov/lov_obd.c | 9 ++------- lustre/osc/osc_request.c | 4 +--- lustre/ptlrpc/recover.c | 4 +--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index 2f490ba..55ef691 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -2242,13 +2242,8 @@ static int lov_statfs(struct obd_device *obd, struct obd_statfs *osfs, err = obd_statfs(class_conn2obd(&lov->tgts[i].conn), &lov_sfs, max_age); if (err) { - if (lov->tgts[i].active) { - CERROR("error: statfs OSC %s on OST idx %d: " - "err = %d\n", - lov->tgts[i].uuid.uuid, i, err); - if (!rc) - rc = err; - } + if (lov->tgts[i].active && !rc) + rc = err; continue; } diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index da2999b..595070c 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -1688,10 +1688,8 @@ static int osc_statfs(struct obd_device *obd, struct obd_statfs *osfs, request->rq_replen = lustre_msg_size(1, &size); rc = ptlrpc_queue_wait(request); - if (rc) { - CERROR("%s failed: rc = %d\n", __FUNCTION__, rc); + if (rc) GOTO(out, rc); - } msfs = lustre_swab_repbuf(request, 0, sizeof(*msfs), lustre_swab_obd_statfs); diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c index d379aff..3320a44 100644 --- a/lustre/ptlrpc/recover.c +++ b/lustre/ptlrpc/recover.c @@ -61,9 +61,7 @@ int ptlrpc_reconnect_import(struct obd_import *imp) struct ptlrpc_request *req; struct lustre_handle old_hdl; __u64 committed_before_reconnect = imp->imp_peer_committed_transno; - - CERROR("reconnect handle "LPX64"\n", - imp->imp_dlm_handle.cookie); + ENTRY; req = ptlrpc_prep_req(imp, imp->imp_connect_op, 3, size, tmp); if (!req) -- 1.8.3.1