From: Timothy Day Date: Tue, 13 Aug 2024 02:17:05 +0000 (-0400) Subject: LU-18136 mdt: remove LDLM_LOCK_* macros X-Git-Tag: 2.15.90~32 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F56006%2F2;p=fs%2Flustre-release.git LU-18136 mdt: remove LDLM_LOCK_* macros These macros are simply duplicates of the corresponding ldlm_lock_* functions. The patch has been generated with the coccinelle script below. @@ expression x; @@ - LDLM_LOCK_PUT(x) + ldlm_lock_put(x) @@ expression x; @@ - LDLM_LOCK_RELEASE(x) + ldlm_lock_put(x) @@ expression x; @@ - LDLM_LOCK_GET(x) + ldlm_lock_get(x) Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I74504d7ea4fd294b7538c17a78c2023a47144e94 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56006 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell Reviewed-by: Andreas Dilger Reviewed-by: jsimmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index f023617..0e7b51b 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -681,7 +681,7 @@ int mdt_pack_size2body(struct mdt_thread_info *info, lock = ldlm_handle2lock(lh); if (lock != NULL) { dom_lock = ldlm_has_dom(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } } @@ -2297,7 +2297,7 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, } fid_extract_from_res_name(child_fid, &lock->l_resource->lr_name); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); child = mdt_object_find(info->mti_env, info->mti_mdt, child_fid); if (IS_ERR(child)) @@ -2518,10 +2518,10 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, ldlm_inodebits_drop(lock, MDS_INODELOCK_DOM); unlock_res_and_lock(lock); } - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); GOTO(unlock_parent, rc = 0); } - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } EXIT; @@ -3844,10 +3844,10 @@ int mdt_check_resent_lock(struct mdt_thread_info *info, DFID"\n", info->mti_exp->exp_obd->obd_name, PFID(mdt_object_fid(mo))); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); RETURN(-EPROTO); } - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); return 0; } return 1; @@ -4051,7 +4051,7 @@ int mdt_object_lock_internal(struct mdt_thread_info *info, lock = ldlm_handle2lock(handle); LASSERT(lock); *ibits = lock->l_policy_data.l_inodebits.bits; - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } return rc; @@ -4319,7 +4319,7 @@ static void mdt_save_lock(struct mdt_thread_info *info, struct lustre_handle *h, CDEBUG(D_HA, "sync_lock, do async commit\n"); mdt_device_commit_async(info->mti_env, mdt); } - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } h->cookie = 0ull; } @@ -4356,7 +4356,7 @@ static void mdt_save_remote_lock(struct mdt_thread_info *info, if (decref || !req || !(mode & (LCK_PW | LCK_EX)) || !tgt_ses_info(info->mti_env)->tsi_has_trans) { ldlm_lock_decref_and_cancel(h, mode); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } else { tgt_save_slc_lock(&info->mti_mdt->mdt_lut, lock, req->rq_transno); @@ -4696,7 +4696,7 @@ int mdt_intent_lock_replace(struct mdt_thread_info *info, LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT); - LDLM_LOCK_RELEASE(new_lock); + ldlm_lock_put(new_lock); lh->mlh_reg_lh.cookie = 0; RETURN(ELDLM_LOCK_REPLACED); } @@ -4729,7 +4729,7 @@ int mdt_intent_lock_replace(struct mdt_thread_info *info, &new_lock->l_remote_handle, &new_lock->l_exp_hash); - LDLM_LOCK_RELEASE(new_lock); + ldlm_lock_put(new_lock); lh->mlh_reg_lh.cookie = 0; RETURN(ELDLM_LOCK_REPLACED); diff --git a/lustre/mdt/mdt_io.c b/lustre/mdt/mdt_io.c index 2d22a27..9f84170 100644 --- a/lustre/mdt/mdt_io.c +++ b/lustre/mdt/mdt_io.c @@ -115,7 +115,7 @@ static void mdt_prolong_dom_lock(struct tgt_session_info *tsi, LASSERT(lock->l_export == data->lpa_export); ldlm_lock_prolong_one(lock, data); lock->l_last_used = ktime_get(); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); if (data->lpa_locks_cnt > 0) RETURN_EXIT; } @@ -1288,7 +1288,7 @@ static int mdt_do_glimpse(const struct lu_env *env, struct ldlm_namespace *ns, /* Populate the gl_work structure. * Grab additional reference on the lock which will be released in * ldlm_work_gl_ast_lock() */ - gl_work->gl_lock = LDLM_LOCK_GET(lock); + gl_work->gl_lock = ldlm_lock_get(lock); /* The glimpse callback is sent to one single IO lock. As a result, * the gl_work list is just composed of one element */ list_add_tail(&gl_work->gl_list, &gl_list); @@ -1303,13 +1303,13 @@ static int mdt_do_glimpse(const struct lu_env *env, struct ldlm_namespace *ns, /* If the list is not empty, we failed to glimpse a lock and * must clean it up. Usually due to a race with unlink.*/ if (!list_empty(&gl_list)) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); OBD_SLAB_FREE_PTR(gl_work, ldlm_glimpse_work_kmem); } rc = 0; EXIT; out: - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); return rc; } @@ -1594,7 +1594,7 @@ bool mdt_dom_client_has_lock(struct mdt_thread_info *info, /* check if lock from the same client */ rc = (lock->l_export->exp_handle.h_cookie == info->mti_exp->exp_handle.h_cookie); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); return rc; } @@ -1739,7 +1739,7 @@ int mdt_dom_read_on_open(struct mdt_thread_info *mti, struct mdt_device *mdt, lock = ldlm_handle2lock(lh); if (lock) { dom_lock = ldlm_has_dom(lock) && ldlm_has_layout(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } } @@ -2008,7 +2008,7 @@ void mdt_dom_discard_data(struct mdt_thread_info *info, unlock_res_and_lock(lock); ldlm_lock_decref_and_cancel(&dom_lh, LCK_PW); } - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); RETURN_EXIT; } diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c index 3e58bed..c5be02f 100644 --- a/lustre/mdt/mdt_mds.c +++ b/lustre/mdt/mdt_mds.c @@ -188,7 +188,7 @@ static int ldlm_enqueue_hpreq_check(struct ptlrpc_request *req) rc = lock->l_granted_mode == lock->l_req_mode; if (rc) LDLM_DEBUG(lock, "hpreq resend"); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } } diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index bfd1769..c4c40d1 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -2121,7 +2121,7 @@ out_unlock: out_reprocess: ldlm_reprocess_all(lease->l_resource, lease->l_policy_data.l_inodebits.bits); - LDLM_LOCK_PUT(lease); + ldlm_lock_put(lease); ma->ma_valid = 0; ma->ma_need = 0; @@ -2349,7 +2349,7 @@ out_obj: lease->l_policy_data.l_inodebits.bits); out_lease: - LDLM_LOCK_PUT(lease); + ldlm_lock_put(lease); if (ma != NULL) { ma->ma_valid = 0; @@ -2468,7 +2468,7 @@ out_unlock: out_reprocess: ldlm_reprocess_all(lease->l_resource, lease->l_policy_data.l_inodebits.bits); - LDLM_LOCK_PUT(lease); + ldlm_lock_put(lease); ma->ma_valid = 0; ma->ma_need = 0; diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index 6e06e3e..e7a562b 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -1758,7 +1758,7 @@ static int mdt_migrate_link_parent_lock(struct mdt_thread_info *info, lock_res_and_lock(lock); ldlm_set_atomic_cb(lock); unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } mdt_object_unlock(info, lnkp, lhl, 1); @@ -2164,7 +2164,7 @@ static int mdd_migrate_close(struct mdt_thread_info *info, ldlm_lock_cancel(lease); ldlm_reprocess_all(lease->l_resource, lease->l_policy_data.l_inodebits.bits); - LDLM_LOCK_PUT(lease); + ldlm_lock_put(lease); close: rc2 = mdt_close_internal(info, mdt_info_req(info), NULL); @@ -3145,7 +3145,7 @@ static int mdt_reint_resync(struct mdt_thread_info *info, out_unlock: up_write(&mo->mot_open_sem); out_put_lease: - LDLM_LOCK_PUT(lease); + ldlm_lock_put(lease); out_obj: mdt_object_put(info->mti_env, mo); out: