From ece19ac2671ccfd0ca83daa8b255fa05f1ee1731 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Mon, 12 Aug 2024 22:03:45 -0400 Subject: [PATCH] LU-18136 ldlm: 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: I52e14ae0fe7e6b946600c98f17c067d93f4e80cf Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56005 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: jsimmons Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_flock.c | 6 ++-- lustre/ldlm/ldlm_lock.c | 70 ++++++++++++++++++++++----------------------- lustre/ldlm/ldlm_lockd.c | 42 +++++++++++++-------------- lustre/ldlm/ldlm_reclaim.c | 2 +- lustre/ldlm/ldlm_request.c | 40 +++++++++++++------------- lustre/ldlm/ldlm_resource.c | 6 ++-- 6 files changed, 83 insertions(+), 83 deletions(-) diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c index e41b98a..9d15816 100644 --- a/lustre/ldlm/ldlm_flock.c +++ b/lustre/ldlm/ldlm_flock.c @@ -557,7 +557,7 @@ reprocess: lock->l_granted_mode); ldlm_flock_add_lock(res, &res->lr_granted, new2); - LDLM_LOCK_RELEASE(new2); + ldlm_lock_put(new2); break; } @@ -880,7 +880,7 @@ ldlm_export_flock_get(struct cfs_hash *hs, struct hlist_node *hnode) struct ldlm_flock *flock; lock = hlist_entry(hnode, struct ldlm_lock, l_exp_flock_hash); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); flock = &lock->l_policy_data.l_flock; LASSERT(flock->blocking_export != NULL); @@ -903,7 +903,7 @@ ldlm_export_flock_put(struct cfs_hash *hs, struct hlist_node *hnode) flock->blocking_owner = 0; flock->blocking_export = NULL; } - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } static struct cfs_hash_ops ldlm_export_flock_ops = { diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index f268545..f7040b3 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -395,7 +395,7 @@ void ldlm_lock_destroy(struct ldlm_lock *lock) /* drop reference from hashtable only for first destroy */ if (first) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } EXIT; } @@ -409,7 +409,7 @@ void ldlm_lock_destroy_nolock(struct ldlm_lock *lock) first = ldlm_lock_destroy_internal(lock); /* drop reference from hashtable only for first destroy */ if (first) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } EXIT; } @@ -504,7 +504,7 @@ struct ldlm_lock *ldlm_lock_new_testing(struct ldlm_resource *resource) if (!rc) return lock; ldlm_lock_destroy(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); return NULL; } EXPORT_SYMBOL(ldlm_lock_new_testing); @@ -613,7 +613,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, if (lock->l_export != NULL && lock->l_export->exp_failed) { CDEBUG(D_INFO, "lock export failed: lock %p, exp %p\n", lock, lock->l_export); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); RETURN(NULL); } @@ -631,7 +631,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, if (unlikely(ldlm_is_destroyed(lock))) { unlock_res_and_lock(lock); CDEBUG(D_INFO, "lock already destroyed: lock %p\n", lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); RETURN(NULL); } @@ -639,7 +639,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, if (flags != 0) { if ((lock->l_flags & flags) != 0) { unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); RETURN(NULL); } @@ -690,10 +690,10 @@ static void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, */ if (list_empty(&lock->l_bl_ast)) { list_add(&lock->l_bl_ast, work_list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); } LASSERT(lock->l_blocking_lock == NULL); - lock->l_blocking_lock = LDLM_LOCK_GET(new); + lock->l_blocking_lock = ldlm_lock_get(new); } } @@ -706,7 +706,7 @@ static void ldlm_add_cp_work_item(struct ldlm_lock *lock, LDLM_DEBUG(lock, "lock granted; sending completion AST."); LASSERT(list_empty(&lock->l_cp_ast)); list_add(&lock->l_cp_ast, work_list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); } } @@ -740,7 +740,7 @@ void ldlm_lock_addref(const struct lustre_handle *lockh, enum ldlm_mode mode) lock = ldlm_handle2lock(lockh); LASSERTF(lock != NULL, "Non-existing lock: %#llx\n", lockh->cookie); ldlm_lock_addref_internal(lock, mode); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } EXPORT_SYMBOL(ldlm_lock_addref); @@ -761,7 +761,7 @@ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, if (mode & (LCK_EX | LCK_CW | LCK_PW | LCK_GROUP | LCK_COS | LCK_TXN)) { lock->l_writers++; } - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); LDLM_DEBUG(lock, "ldlm_lock_addref(%s)", ldlm_lockname[mode]); } @@ -788,7 +788,7 @@ int ldlm_lock_addref_try(const struct lustre_handle *lockh, enum ldlm_mode mode) result = 0; } unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } return result; } @@ -826,7 +826,7 @@ void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, lock->l_writers--; } - LDLM_LOCK_RELEASE(lock); /* matches the LDLM_LOCK_GET() in addref */ + ldlm_lock_put(lock); /* matches the LDLM_LOCK_GET() in addref */ } /** @@ -876,7 +876,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, enum ldlm_mode mode) "final decref done on %sCBPENDING lock", mask & D_WARNING ? "non-local " : ""); - LDLM_LOCK_GET(lock); /* dropped by bl thread */ + ldlm_lock_get(lock); /* dropped by bl thread */ ldlm_lock_remove_from_lru(lock); unlock_res_and_lock(lock); @@ -920,7 +920,7 @@ void ldlm_lock_decref(const struct lustre_handle *lockh, enum ldlm_mode mode) LASSERTF(lock != NULL, "Non-existing lock: %#llx\n", lockh->cookie); ldlm_lock_decref_internal(lock, mode); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } EXPORT_SYMBOL(ldlm_lock_decref); @@ -944,7 +944,7 @@ void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh, ldlm_set_cbpending(lock); unlock_res_and_lock(lock); ldlm_lock_decref_internal(lock, mode); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } EXPORT_SYMBOL(ldlm_lock_decref_and_cancel); @@ -1249,7 +1249,7 @@ matched: */ if ((data->lmd_flags & LDLM_FL_TEST_LOCK) || (ldlm_is_cbpending(lock) && (data->lmd_match & LDLM_MATCH_GROUP))) { - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); ldlm_lock_touch_in_lru(lock); } else { ldlm_lock_addref_internal_nolock(lock, match); @@ -1457,7 +1457,7 @@ repeat: if (group_lock) { l_wait_event_abortable(group_lock->l_waitq, ldlm_is_destroyed(lock)); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); goto repeat; } ldlm_resource_putref(res); @@ -1500,7 +1500,7 @@ repeat: out_fail_match: if (flags & LDLM_FL_TEST_LOCK) - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); else if (!matched) ldlm_lock_decref_internal(lock, mode); } @@ -1516,7 +1516,7 @@ out_fail_match: res_id->name[3] : policy->l_extent.end); } if (data.lmd_old != NULL) - LDLM_LOCK_PUT(data.lmd_old); + ldlm_lock_put(data.lmd_old); return matched; } @@ -1551,7 +1551,7 @@ enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh, out: if (lock != NULL) { unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } return mode; } @@ -1717,7 +1717,7 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, out: ldlm_lock_destroy(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(ERR_PTR(rc)); } @@ -1782,7 +1782,7 @@ enum ldlm_error ldlm_lock_enqueue(const struct lu_env *env, */ if (lock != *lockp) { ldlm_lock_destroy(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } *flags |= LDLM_FL_LOCK_CHANGED; RETURN(0); @@ -2086,7 +2086,7 @@ void ldlm_discard_bl_list(struct list_head *bl_list) ldlm_clear_ast_sent(lock); LASSERT(lock->l_bl_ast_run == 0); ldlm_clear_blocking_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } EXIT; } @@ -2120,7 +2120,7 @@ ldlm_work_bl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) */ if (!ldlm_is_ast_sent(lock)) { unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(0); } @@ -2161,7 +2161,7 @@ ldlm_work_bl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) rc = lock->l_blocking_ast(lock, &d, (void *)arg, LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(rc); } @@ -2189,7 +2189,7 @@ ldlm_work_revoke_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) desc.l_granted_mode = 0; rc = lock->l_blocking_ast(lock, &desc, (void *)arg, LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(rc); } @@ -2225,7 +2225,7 @@ int ldlm_work_gl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) else if (rc == -ELDLM_NO_LOCK_DATA) ldlm_lvbo_update(lock->l_resource, lock, NULL, 1); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); if (gl_work->gl_flags & LDLM_GL_WORK_SLAB_ALLOCATED) OBD_SLAB_FREE_PTR(gl_work, ldlm_glimpse_work_kmem); else @@ -2276,7 +2276,7 @@ ldlm_work_cp_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) if (completion_callback != NULL) rc = completion_callback(lock, 0, (void *)arg); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(rc); } @@ -2528,7 +2528,7 @@ int ldlm_lock_set_data(const struct lustre_handle *lockh, void *data) lock->l_ast_data = data; if (lock->l_ast_data == data) rc = 0; - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } RETURN(rc); } @@ -2574,9 +2574,9 @@ ldlm_cancel_locks_for_export_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, struct obd_export *exp = ecl->ecl_exp; struct ldlm_lock *lock = cfs_hash_object(hs, hnode); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); ldlm_cancel_lock_for_export(exp, lock, ecl); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); return 0; } @@ -2607,7 +2607,7 @@ int ldlm_export_cancel_blocked_locks(struct obd_export *exp) if (!list_empty(&exp->exp_bl_list)) { lock = list_first_entry(&exp->exp_bl_list, struct ldlm_lock, l_exp_list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); list_del_init(&lock->l_exp_list); } else { lock = NULL; @@ -2618,7 +2618,7 @@ int ldlm_export_cancel_blocked_locks(struct obd_export *exp) break; ldlm_cancel_lock_for_export(exp, lock, &ecl); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } lu_env_fini(&env); @@ -2745,7 +2745,7 @@ void ldlm_lock_dump_handle(int level, const struct lustre_handle *lockh) LDLM_DEBUG_LIMIT(level, lock, "###"); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } EXPORT_SYMBOL(ldlm_lock_dump_handle); diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 0abd66f..de3fd59 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -205,7 +205,7 @@ static int expired_lock_main(void *arg) * ldlm_add_waiting_lock() or * ldlm_failed_ast() */ - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } @@ -214,7 +214,7 @@ static int expired_lock_main(void *arg) * release the lock refcount where * waiting_locks_callback() founds */ - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } export = class_export_lock_get(lock->l_export, lock); @@ -249,7 +249,7 @@ static int expired_lock_main(void *arg) * release extra ref grabbed by ldlm_add_waiting_lock() * or ldlm_failed_ast() */ - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); spin_lock_bh(&waiting_locks_spinlock); } @@ -461,7 +461,7 @@ static int ldlm_add_waiting_lock(struct ldlm_lock *lock, timeout_t timeout) * grab ref on the lock if it has been added to the * waiting list */ - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); } spin_unlock_bh(&waiting_locks_spinlock); @@ -541,7 +541,7 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock) * release lock ref if it has indeed been removed * from a list */ - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } LDLM_DEBUG(lock, "%s", ret == 0 ? "wasn't waiting" : "removed"); @@ -704,7 +704,7 @@ static void ldlm_failed_ast(struct ldlm_lock *lock, int rc, * the lock was not in any list, grab an extra ref before adding * the lock to the expired list */ - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); /* differentiate it from expired locks */ lock->l_callback_timestamp = 0; list_add(&lock->l_pending_chain, &expired_lock_list); @@ -837,7 +837,7 @@ static int ldlm_cb_interpret(const struct lu_env *env, } /* release extra reference taken in ldlm_ast_fini() */ - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); if (rc == -ERESTART) atomic_inc(&arg->restart); @@ -868,7 +868,7 @@ static inline int ldlm_ast_fini(struct ptlrpc_request *req, if (rc == 0) atomic_inc(&arg->restart); } else { - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); ptlrpc_set_add_req(arg->set, req); } @@ -1609,7 +1609,7 @@ retry: ldlm_reprocess_all(lock->l_resource, lock->l_policy_data.l_inodebits.bits); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } LDLM_DEBUG_NOLOCK("server-side enqueue handler END (lock %p, rc %d)", @@ -1626,7 +1626,7 @@ EXPORT_SYMBOL(ldlm_handle_enqueue); void ldlm_clear_blocking_lock(struct ldlm_lock *lock) { if (lock->l_blocking_lock) { - LDLM_LOCK_RELEASE(lock->l_blocking_lock); + ldlm_lock_put(lock->l_blocking_lock); lock->l_blocking_lock = NULL; } } @@ -1725,7 +1725,7 @@ int ldlm_handle_convert0(struct ptlrpc_request *req, EXIT; out_put: LDLM_DEBUG(lock, "server-side convert handler END, rc = %d", rc); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); req->rq_status = rc; return 0; } @@ -1816,7 +1816,7 @@ int ldlm_request_cancel(struct ptlrpc_request *req, delay); } ldlm_lock_cancel(lock); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); } if (pres != NULL) { ldlm_reprocess_all(pres, 0); @@ -1944,7 +1944,7 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns, } LDLM_DEBUG(lock, "client blocking callback handler END"); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); EXIT; } @@ -2029,7 +2029,7 @@ static int ldlm_handle_cp_callback(struct ptlrpc_request *req, if (ldlm_is_failed(lock)) { unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(-EINVAL); } @@ -2104,7 +2104,7 @@ out: unlock_res_and_lock(lock); wake_up(&lock->l_waitq); } - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); return 0; } @@ -2158,7 +2158,7 @@ static void ldlm_handle_gl_callback(struct ptlrpc_request *req, return; } unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); EXIT; } @@ -2478,7 +2478,7 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) "callback on lock %llx - lock disappeared", dlm_req->lock_handle[0].cookie); unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); rc = ldlm_callback_reply(req, -EINVAL); ldlm_callback_errmsg(req, "Operate on stale lock", rc, &dlm_req->lock_handle[0]); @@ -2679,7 +2679,7 @@ static int ldlm_cancel_hpreq_check(struct ptlrpc_request *req) rc = ldlm_is_ast_sent(lock) ? 1 : 0; if (rc) LDLM_DEBUG(lock, "hpreq cancel/convert lock"); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); if (rc) break; @@ -2757,7 +2757,7 @@ static int ldlm_revoke_lock_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, } list_add_tail(&lock->l_rk_ast, rpc_list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); unlock_res_and_lock(lock); return 0; @@ -3140,7 +3140,7 @@ ldlm_export_lock_get(struct cfs_hash *hs, struct hlist_node *hnode) struct ldlm_lock *lock; lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); } static void @@ -3149,7 +3149,7 @@ ldlm_export_lock_put(struct cfs_hash *hs, struct hlist_node *hnode) struct ldlm_lock *lock; lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } static struct cfs_hash_ops ldlm_export_lock_ops = { diff --git a/lustre/ldlm/ldlm_reclaim.c b/lustre/ldlm/ldlm_reclaim.c index 2f8e2c0..4728c6c 100644 --- a/lustre/ldlm/ldlm_reclaim.c +++ b/lustre/ldlm/ldlm_reclaim.c @@ -137,7 +137,7 @@ static int ldlm_reclaim_lock_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, ldlm_set_ast_sent(lock); LASSERT(list_empty(&lock->l_rk_ast)); list_add(&lock->l_rk_ast, &data->rcd_rpc_list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); if (++data->rcd_added == data->rcd_total) { rc = 1; /* stop the iteration */ break; diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index ef0877e..4c4f09a 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -518,7 +518,7 @@ int ldlm_cli_enqueue_local(const struct lu_env *env, LDLM_DEBUG(lock, "client-side local enqueue handler, new lock created"); EXIT; out: - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); out_nolock: return err; } @@ -791,8 +791,8 @@ cleanup: if (cleanup_phase == 1 && rc) failed_lock_cleanup(ns, lock, einfo->ei_mode); /* Put lock 2 times, the second reference is held by ldlm_cli_enqueue */ - LDLM_LOCK_PUT(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); + ldlm_lock_put(lock); return rc; } EXPORT_SYMBOL(ldlm_cli_enqueue_fini); @@ -1029,7 +1029,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, req = ldlm_enqueue_pack(exp, lvb_len); if (IS_ERR(req)) { failed_lock_cleanup(ns, lock, einfo->ei_mode); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(PTR_ERR(req)); } @@ -1090,7 +1090,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, if (einfo->ei_mod_slot) ptlrpc_put_mod_rpc_slot(req); failed_lock_cleanup(ns, lock, einfo->ei_mode); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); if (!req_passed_in) ptlrpc_req_put(req); GOTO(out, rc); @@ -1115,7 +1115,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, * one reference that we took */ if (err == -ENOLCK) - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); else rc = err; @@ -1621,7 +1621,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh, if (ldlm_is_bl_ast(lock)) { if (ldlm_is_ast_sent(lock)) { unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(0); } if (ldlm_is_canceling(lock)) @@ -1634,7 +1634,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh, unlock_res_and_lock(lock); wait_event_idle(lock->l_waitq, is_bl_done(lock)); } - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(0); } @@ -1647,7 +1647,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh, rc = ldlm_cli_cancel_local(lock); if (rc == LDLM_FL_LOCAL_ONLY || flags & LCF_LOCAL) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(0); } else if (rc == LDLM_FL_BL_AST) { /* BL_AST lock must not wait. */ @@ -1660,7 +1660,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh, * waiting for the batch to be handled. */ if (separate) { ldlm_cli_cancel_req(exp, lock, NULL, 1, flags); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); RETURN(0); } @@ -1725,7 +1725,7 @@ int ldlm_cli_cancel_list_local(struct list_head *cancels, int count, if (rc == LDLM_FL_LOCAL_ONLY) { /* CANCEL RPC should not be sent to server. */ list_del_init(&lock->l_bl_ast); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); count--; } } @@ -1980,7 +1980,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, last_use = lock->l_last_used; - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); spin_unlock(&ns->ns_lock); /* @@ -2000,7 +2000,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, */ result = pf(ns, lock, added, min); if (result == LDLM_POLICY_KEEP_LOCK) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); break; } @@ -2013,7 +2013,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, spin_unlock(&ns->ns_lock); } - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } @@ -2030,7 +2030,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, * pages could be put under it. */ unlock_res_and_lock(lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } LASSERT(!lock->l_readers && !lock->l_writers); @@ -2186,7 +2186,7 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res, lock_flags; LASSERT(list_empty(&lock->l_bl_ast)); list_add(&lock->l_bl_ast, cancels); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); count++; } unlock_res(res); @@ -2450,7 +2450,7 @@ static int ldlm_chain_lock_for_replay(struct ldlm_lock *lock, void *closure) */ if (!(lock->l_flags & (LDLM_FL_FAILED|LDLM_FL_BL_DONE))) { list_add(&lock->l_pending_chain, list); - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); } return LDLM_ITER_CONTINUE; @@ -2501,7 +2501,7 @@ static int replay_lock_interpret(const struct lu_env *env, LDLM_DEBUG(lock, "replayed lock:"); ptlrpc_import_recovery_state_machine(req->rq_import); - LDLM_LOCK_PUT(lock); + ldlm_lock_put(lock); out: if (rc != ELDLM_OK) ptlrpc_connect_import(req->rq_import); @@ -2665,11 +2665,11 @@ static int __ldlm_replay_locks(struct obd_import *imp, bool rate_limit) /* If we disconnected in the middle - cleanup and let * reconnection to happen again. LU-14027 */ if (rc || (imp->imp_state != LUSTRE_IMP_REPLAY_LOCKS)) { - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } rc = replay_one_lock(imp, lock); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); if (rate_limit) wait_event_idle_exclusive(imp->imp_replay_waitq, diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index abe3a3f..c859458 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -1065,7 +1065,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, continue; lock = tmp; - LDLM_LOCK_GET(lock); + ldlm_lock_get(lock); ldlm_set_cleaned(lock); break; } @@ -1103,7 +1103,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, if (lock->l_completion_ast) lock->l_completion_ast(lock, LDLM_FL_FAILED, NULL); - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); continue; } @@ -1121,7 +1121,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, "Freeing a lock still held by a client node"); ldlm_lock_cancel(lock); } - LDLM_LOCK_RELEASE(lock); + ldlm_lock_put(lock); } while (1); } -- 1.8.3.1