From e489ba8fba1e0408452860b1afb0a273677472ad Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 20 Oct 2009 03:56:08 +0000 Subject: [PATCH] - enable llog connect from mds back --- lustre/mds/mds_lov.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c index fb9e458..6d3de44 100644 --- a/lustre/mds/mds_lov.c +++ b/lustre/mds/mds_lov.c @@ -940,7 +940,7 @@ static int __mds_lov_synchronize(void *data) enum obd_notify_event ev = mlsi->mlsi_ev; struct mds_group_info mgi; struct llog_ctxt *ctxt; - int rc = 0, rc2; + int rc = 0; ENTRY; OBD_FREE_PTR(mlsi); @@ -977,15 +977,11 @@ static int __mds_lov_synchronize(void *data) OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT, 60); rc = llog_connect(ctxt, NULL, NULL, uuid); llog_ctxt_put(ctxt); -#if 0 if (rc != 0) { CERROR("%s failed at llog_origin_connect: %d\n", obd_uuid2str(uuid), rc); GOTO(out, rc); } -+#else -+#warning "requires proper support with OSD-based llog -#endif } else CERROR("can't get llog context\n"); @@ -1013,7 +1009,6 @@ static int __mds_lov_synchronize(void *data) out: up_read(&mds->mds_notify_lock); if (rc) { -#if 0 /* Deactivate it for safety */ CERROR("%s sync failed %d, deactivating\n", obd_uuid2str(uuid), rc); @@ -1021,7 +1016,6 @@ out: !mds->mds_osc_obd->obd_stopping && !watched->obd_stopping) obd_notify(mds->mds_osc_obd, watched, OBD_NOTIFY_INACTIVE, NULL); -#endif } class_decref(obd, "mds_lov_synchronize", obd); -- 1.8.3.1