From: Timothy Day <timday@amazon.com>
Date: Tue, 13 Aug 2024 02:24:44 +0000 (-0400)
Subject: LU-18136 mgs: remove LDLM_LOCK_* macros
X-Git-Tag: 2.15.90~25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2291ae55f7a1a20ab8f553f76e4657d0e3e7661f;p=fs%2Flustre-release.git

LU-18136 mgs: 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: I7b24117325f61ea04618a2d45a36951773f1d566
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56013
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Patrick Farrell <patrick.farrell@oracle.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/mgs/mgs_barrier.c b/lustre/mgs/mgs_barrier.c
index 98196c2..d23eff3 100644
--- a/lustre/mgs/mgs_barrier.c
+++ b/lustre/mgs/mgs_barrier.c
@@ -131,7 +131,7 @@ again:
 		if (!work->gl_lock)
 			break;
 
-		LDLM_LOCK_RELEASE(work->gl_lock);
+		ldlm_lock_put(work->gl_lock);
 		work->gl_lock = NULL;
 	}
 
@@ -151,7 +151,7 @@ again:
 		struct ldlm_lock *lock = list_entry(pos, struct ldlm_lock,
 						    l_res_link);
 
-		work->gl_lock = LDLM_LOCK_GET(lock);
+		work->gl_lock = ldlm_lock_get(lock);
 		work->gl_flags = 0;
 		work->gl_desc = desc;
 		work->gl_interpret_reply = mgs_barrier_gl_interpret_reply;
@@ -191,7 +191,7 @@ out:
 	list_for_each_entry_safe(work, tmp, &gl_list, gl_list) {
 		list_del(&work->gl_list);
 		if (work->gl_lock)
-			LDLM_LOCK_RELEASE(work->gl_lock);
+			ldlm_lock_put(work->gl_lock);
 		OBD_FREE_PTR(work);
 	}