LU-18136 mdc: 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 <timday@amazon.com>
Change-Id: I55795d7f2a7f642e4e7076a56a0268088eb9cffe
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56008
Reviewed-by: Patrick Farrell <patrick.farrell@oracle.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: jsimmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c
index 0a22203..e0d96bc 100644 (file)
--- a/lustre/mdc/mdc_dev.c
+++ b/lustre/mdc/mdc_dev.c
@@ -110,7 +110,7 @@ static int mdc_dom_lock_match(const struct lu_env *env, struct obd_export *exp,
                        ldlm_lock_decref(lockh, rc);
                        rc = 0;
                }
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
        RETURN(rc);
 }
@@ -191,7 +191,7 @@ static bool mdc_check_and_discard_cb(const struct lu_env *env, struct cl_io *io,
                                        OSC_DAP_FL_TEST_LOCK | OSC_DAP_FL_AST);
                        if (tmp != NULL) {
                                info->oti_fn_index = CL_PAGE_EOF;
-                               LDLM_LOCK_PUT(tmp);
+                               ldlm_lock_put(tmp);
                        } else if (cl_page_own(env, io, page) == 0) {
                                /* discard the page */
                                cl_page_discard(env, io, page);
@@ -612,7 +612,7 @@ static int mdc_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
                memcpy(&lock->l_ost_lvb, &ols->ols_lvb,
                       sizeof(lock->l_ost_lvb));
                unlock_res_and_lock(lock);
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
                *flags |= LDLM_FL_LVB_READY;
        }
 
@@ -676,7 +676,7 @@ static int mdc_enqueue_interpret(const struct lu_env *env,
        CFS_FAIL_TIMEOUT(OBD_FAIL_OSC_CP_CANCEL_RACE, 10);
 
        ldlm_lock_decref(lockh, mode);
-       LDLM_LOCK_PUT(lock);
+       ldlm_lock_put(lock);
        RETURN(rc);
 }
 
@@ -738,11 +738,11 @@ static int mdc_enqueue_send(const struct lu_env *env, struct obd_export *exp,
                        (*upcall)(cookie, &lockh, ELDLM_LOCK_MATCHED);
 
                        ldlm_lock_decref(&lockh, mode);
-                       LDLM_LOCK_PUT(matched);
+                       ldlm_lock_put(matched);
                        RETURN(ELDLM_OK);
                }
                ldlm_lock_decref(&lockh, mode);
-               LDLM_LOCK_PUT(matched);
+               ldlm_lock_put(matched);
        }
 
        if (*flags & (LDLM_FL_TEST_LOCK | LDLM_FL_MATCH_LOCK))
@@ -1027,7 +1027,7 @@ static int mdc_get_lock_handle(const struct lu_env *env, struct osc_object *osc,
                return -ENOENT;
        } else {
                *lh = lock->l_remote_handle;
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
        return 0;
 }

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index c3c066d..2c431ae 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -522,7 +522,7 @@ static void mdc_close_intent_pack(struct req_capsule *pill,
        lock = ldlm_handle2lock(&op_data->op_lease_handle);
        if (lock != NULL) {
                data->cd_handle = lock->l_remote_handle;
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
        ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
 

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index ea2a4d3..7b44133 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -109,7 +109,7 @@ int mdc_set_lock_data(struct obd_export *exp, const struct lustre_handle *lockh,
                *bits = lock->l_policy_data.l_inodebits.bits;
 
        unlock_res_and_lock(lock);
-       LDLM_LOCK_PUT(lock);
+       ldlm_lock_put(lock);
 
        RETURN(0);
 }
@@ -788,7 +788,7 @@ int mdc_finish_enqueue(struct obd_export *exp,
                        ldlm_lock_decref(lockh, einfo->ei_mode);
                        einfo->ei_mode = lock->l_req_mode;
                }
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
 
        lockrep = req_capsule_server_get(pill, &RMF_DLM_REP);
@@ -963,7 +963,7 @@ int mdc_finish_enqueue(struct obd_export *exp,
                unlock_res_and_lock(lock);
        }
 out_lock:
-       LDLM_LOCK_PUT(lock);
+       ldlm_lock_put(lock);
 
        RETURN(rc);
 }
@@ -1274,7 +1274,7 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
                                 PLDLMRES(lock->l_resource),
                                 PFID(&body->mbo_fid1));
                }
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
 
                memcpy(&old_lock, lockh, sizeof(*lockh));
                if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,

diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index 4df7794..e857579 100644 (file)
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -572,7 +572,7 @@ int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
        lock = ldlm_handle2lock(&op_data->op_lease_handle);
        if (lock != NULL) {
                rec->rs_lease_handle = lock->l_remote_handle;
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
 
        ptlrpc_request_set_replen(req);