From 3322dcf6519854dd8bfe7fb1bf5a616c1deac898 Mon Sep 17 00:00:00 2001 From: tappro Date: Wed, 31 Oct 2007 19:03:13 +0000 Subject: [PATCH] - replace MDT_FAIL_* with OBD_FAIL_* b:14001 i:nikita, yury --- lustre/mdt/mdt_handler.c | 21 ++++++++++----------- lustre/mdt/mdt_internal.h | 26 -------------------------- lustre/mdt/mdt_open.c | 6 +++--- lustre/mdt/mdt_recovery.c | 2 +- lustre/mdt/mdt_reint.c | 6 +++--- 5 files changed, 17 insertions(+), 44 deletions(-) diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 9168c10..89cb9b9 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -40,7 +40,6 @@ #include /* * struct OBD_{ALLOC,FREE}*() - * MDT_FAIL_CHECK */ #include /* struct ptlrpc_request */ @@ -286,7 +285,7 @@ static int mdt_getstatus(struct mdt_thread_info *info) if (rc) RETURN(err_serious(rc)); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_GETSTATUS_PACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETSTATUS_PACK)) RETURN(err_serious(-ENOMEM)); repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY); @@ -334,7 +333,7 @@ static int mdt_statfs(struct mdt_thread_info *info) if (rc) RETURN(err_serious(rc)); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_STATFS_PACK)) { + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_STATFS_PACK)) { rc = err_serious(-ENOMEM); } else { osfs = req_capsule_server_get(&info->mti_pill,&RMF_OBD_STATFS); @@ -419,7 +418,7 @@ static int mdt_getattr_internal(struct mdt_thread_info *info, int rc; ENTRY; - if (unlikely(MDT_FAIL_CHECK(OBD_FAIL_MDS_GETATTR_PACK))) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETATTR_PACK)) RETURN(err_serious(-ENOMEM)); repbody = req_capsule_server_get(pill, &RMF_MDT_BODY); @@ -1121,7 +1120,7 @@ static int mdt_sendpage(struct mdt_thread_info *info, if (rc) GOTO(free_desc, rc); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_SENDPAGE)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SENDPAGE)) GOTO(abort_bulk, rc); *lwi = LWI_TIMEOUT(obd_timeout * HZ / 4, NULL, NULL); @@ -1334,7 +1333,7 @@ static int mdt_readpage(struct mdt_thread_info *info) int i; ENTRY; - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK)) RETURN(err_serious(-ENOMEM)); reqbody = req_capsule_client_get(&info->mti_pill, &RMF_MDT_BODY); @@ -1385,7 +1384,7 @@ free_rdpg: __cfs_free_page(rdpg->rp_pages[i]); OBD_FREE(rdpg->rp_pages, rdpg->rp_npages * sizeof rdpg->rp_pages[0]); - MDT_FAIL_RETURN(OBD_FAIL_MDS_SENDPAGE, 0); + OBD_FAIL_RETURN(OBD_FAIL_MDS_SENDPAGE, 0); return rc; } @@ -1425,7 +1424,7 @@ static int mdt_reint_internal(struct mdt_thread_info *info, repbody->aclsize = 0; } - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNPACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNPACK)) GOTO(out_shrink, rc = err_serious(-EFAULT)); rc = mdt_reint_unpack(info, op); @@ -1538,7 +1537,7 @@ static int mdt_sync(struct mdt_thread_info *info) if (body == NULL) RETURN(err_serious(-EINVAL)); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_SYNC_PACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SYNC_PACK)) RETURN(err_serious(-ENOMEM)); if (fid_seq(&body->fid1) == 0) { @@ -2164,7 +2163,7 @@ static void mdt_thread_info_init(struct ptlrpc_request *req, if (req->rq_export) { info->mti_mdt = mdt_dev(req->rq_export->exp_obd->obd_lu_dev); info->mti_exp = req->rq_export; - } else + } else info->mti_mdt = NULL; info->mti_env = req->rq_svc_thread->t_env; ci = md_capainfo(info->mti_env); @@ -2320,7 +2319,7 @@ static int mdt_handle0(struct ptlrpc_request *req, ENTRY; - MDT_FAIL_RETURN(OBD_FAIL_MDS_ALL_REQUEST_NET | OBD_FAIL_ONCE, 0); + OBD_FAIL_RETURN(OBD_FAIL_MDS_ALL_REQUEST_NET | OBD_FAIL_ONCE, 0); LASSERT(current->journal_info == NULL); diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index e1a405a..fee383f 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -695,32 +695,6 @@ static inline int mdt_check_resent(struct mdt_thread_info *info, RETURN(0); } -#define MDT_FAIL_CHECK(id) \ -({ \ - if (unlikely(OBD_FAIL_CHECK(id))) \ - CERROR(LUSTRE_MDT_NAME": " #id " test failed\n"); \ - OBD_FAIL_CHECK(id); \ -}) - -#define MDT_FAIL_CHECK_ONCE(id) \ -({ int _ret_ = 0; \ - if (unlikely(OBD_FAIL_CHECK(id))) { \ - CERROR(LUSTRE_MDT_NAME": *** obd_fail_loc=%x ***\n", id); \ - obd_fail_loc |= OBD_FAILED; \ - if ((id) & OBD_FAIL_ONCE) \ - obd_fail_loc |= OBD_FAIL_ONCE; \ - _ret_ = 1; \ - } \ - _ret_; \ -}) - -#define MDT_FAIL_RETURN(id, ret) \ -do { \ - if (unlikely(MDT_FAIL_CHECK_ONCE(id))) { \ - RETURN(ret); \ - } \ -} while(0) - struct md_ucred *mdt_ucred(const struct mdt_thread_info *info); static inline int is_identity_get_disabled(struct upcall_cache *cache) diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 872bd1b..f5f6b8e 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -604,7 +604,7 @@ static int mdt_finish_open(struct mdt_thread_info *info, } else if (flags & MDS_OPEN_DIRECTORY) RETURN(-ENOTDIR); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_CREATE)) { + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_CREATE)) { obd_fail_loc = OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE; RETURN(-EAGAIN); } @@ -891,7 +891,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) "regular open\n"); } - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK)) GOTO(out, result = err_serious(-ENOMEM)); mdt_set_disposition(info, ldlm_rep, @@ -1213,7 +1213,7 @@ int mdt_close(struct mdt_thread_info *info) if (repbody != NULL) mdt_shrink_reply(info); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) RETURN(err_serious(-ENOMEM)); RETURN(rc ? rc : ret); diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c index 38f8ecb..23830f0 100644 --- a/lustre/mdt/mdt_recovery.c +++ b/lustre/mdt/mdt_recovery.c @@ -581,7 +581,7 @@ int mdt_client_new(const struct lu_env *env, struct mdt_device *mdt) spin_lock(&mdt->mdt_client_bitmap_lock); cl_idx = find_first_zero_bit(bitmap, LR_MAX_CLIENTS); if (cl_idx >= LR_MAX_CLIENTS || - MDT_FAIL_CHECK_ONCE(OBD_FAIL_MDS_CLIENT_ADD)) { + OBD_FAIL_CHECK_ONCE(OBD_FAIL_MDS_CLIENT_ADD)) { CERROR("no room for %u clients - fix LR_MAX_CLIENTS\n", cl_idx); spin_unlock(&mdt->mdt_client_bitmap_lock); diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index eba73a4..8a0a9f0 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -399,7 +399,7 @@ static int mdt_reint_create(struct mdt_thread_info *info, int rc; ENTRY; - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE)) GOTO(out, rc = err_serious(-ESTALE)); if (info->mti_dlm_req) @@ -453,7 +453,7 @@ static int mdt_reint_unlink(struct mdt_thread_info *info, if (info->mti_dlm_req) ldlm_request_cancel(req, info->mti_dlm_req, 0); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK)) GOTO(out, rc = err_serious(-ENOENT)); /* step 1: lock the parent */ @@ -553,7 +553,7 @@ static int mdt_reint_link(struct mdt_thread_info *info, DEBUG_REQ(D_INODE, req, "link "DFID" to "DFID"/%s", PFID(rr->rr_fid1), PFID(rr->rr_fid2), rr->rr_name); - if (MDT_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK)) + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK)) GOTO(out, rc = err_serious(-ENOENT)); if (info->mti_dlm_req) -- 1.8.3.1