From 5f62adb07152191c2efc3b4ea3446240a69bcb71 Mon Sep 17 00:00:00 2001 From: shadow Date: Fri, 5 Sep 2008 11:06:57 +0000 Subject: [PATCH] fix paralel init for llog. make llog more smp safe. don't write big array into journal. fix return codes in llog_put_cat_list/llog_get_cat_list. Branch b1_8_gate b=16679 i=umka i=adilger --- lustre/ptlrpc/llog_net.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c index 5a16b56..2a79e1d 100644 --- a/lustre/ptlrpc/llog_net.c +++ b/lustre/ptlrpc/llog_net.c @@ -73,11 +73,17 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, struct llogd_conn_body *req_body; int size[2] = { sizeof(struct ptlrpc_body), sizeof(struct llogd_conn_body) }; - struct inode* inode = ctxt->loc_handle->lgh_file->f_dentry->d_inode; + struct inode *inode; void *handle; int rc, rc1; ENTRY; + LASSERT(ctxt != NULL); + LASSERT(ctxt->loc_handle != NULL); + LASSERT(ctxt->loc_handle->lgh_file != NULL); + LASSERT(ctxt->loc_handle->lgh_file->f_dentry != NULL); + inode = ctxt->loc_handle->lgh_file->f_dentry->d_inode; + if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) { CDEBUG(D_HA, "there is no record related to ctxt %p\n", ctxt); RETURN(0); @@ -93,9 +99,9 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len = sizeof(*lgr); lgr->lgr_hdr.lrh_type = LLOG_GEN_REC; - handle = fsfilt_start_log(ctxt->loc_exp->exp_obd, inode, + handle = fsfilt_start_log(ctxt->loc_exp->exp_obd, inode, FSFILT_OP_CANCEL_UNLINK, NULL, 1); - + if (IS_ERR(handle)) { CERROR("fsfilt_start failed: %ld\n", PTR_ERR(handle)); OBD_FREE(lgr, sizeof(*lgr)); @@ -105,7 +111,7 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, lgr->lgr_gen = ctxt->loc_gen; rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1); OBD_FREE(lgr, sizeof(*lgr)); - + rc1 = fsfilt_commit(ctxt->loc_exp->exp_obd, inode, handle, 0); if (rc != 1 || rc1 != 0) { rc = (rc != 1) ? rc : rc1; -- 1.8.3.1