From: Timothy Day <timday@amazon.com>
Date: Fri, 20 Dec 2024 04:14:59 +0000 (-0500)
Subject: LU-16565 mdc: Remove ldlm is,set,clear macros
X-Git-Tag: 2.16.53~17
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f718723bc62ae1a83a2629c10d92fbd8409f7e05;p=fs%2Flustre-release.git

LU-16565 mdc: Remove ldlm is,set,clear macros

Replaces ldlm_{is,set,clear} macros with the direct flag
names.

The patch has been generated with the coccinelle script in
contrib/cocci/ldlm_flags.cocci.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: I03dfce5398c17201e4f18b3c9792daab751fa8e6
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57547
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c
index 81f1b4d..d4abd4a 100644
--- a/lustre/mdc/mdc_dev.c
+++ b/lustre/mdc/mdc_dev.c
@@ -100,10 +100,10 @@ static int mdc_dom_lock_match(const struct lu_env *env, struct obd_export *exp,
 		LASSERT(lock != NULL);
 		if (mdc_set_dom_lock_data(lock, obj)) {
 			lock_res_and_lock(lock);
-			if (!ldlm_is_lvb_cached(lock)) {
+			if (!(lock->l_flags & LDLM_FL_LVB_CACHED)) {
 				LASSERT(lock->l_ast_data == obj);
 				mdc_lock_lvb_update(env, obj, lock, NULL);
-				ldlm_set_lvb_cached(lock);
+				(lock->l_flags |= LDLM_FL_LVB_CACHED);
 			}
 			unlock_res_and_lock(lock);
 		} else {
@@ -312,7 +312,7 @@ static int mdc_dlm_canceling(const struct lu_env *env,
 		RETURN(0);
 	}
 
-	discard = ldlm_is_discard_data(dlmlock);
+	discard = (dlmlock->l_flags & LDLM_FL_DISCARD_DATA);
 	if (dlmlock->l_granted_mode & (LCK_PW | LCK_GROUP))
 		mode = CLM_WRITE;
 
@@ -493,11 +493,11 @@ static void mdc_lock_granted(const struct lu_env *env, struct osc_lock *oscl,
 		descr->cld_end = CL_PAGE_EOF;
 
 		/* no lvb update for matched lock */
-		if (!ldlm_is_lvb_cached(dlmlock)) {
+		if (!(dlmlock->l_flags & LDLM_FL_LVB_CACHED)) {
 			LASSERT(oscl->ols_flags & LDLM_FL_LVB_READY);
 			LASSERT(osc == dlmlock->l_ast_data);
 			mdc_lock_lvb_update(env, osc, dlmlock, NULL);
-			ldlm_set_lvb_cached(dlmlock);
+			(dlmlock->l_flags |= LDLM_FL_LVB_CACHED);
 		}
 	}
 	unlock_res_and_lock(dlmlock);
@@ -734,7 +734,7 @@ static int mdc_enqueue_send(const struct lu_env *env, struct obd_export *exp,
 		matched = ldlm_handle2lock(&lockh);
 
 		if (CFS_FAIL_CHECK(OBD_FAIL_MDC_GLIMPSE_DDOS))
-			ldlm_set_kms_ignore(matched);
+			(matched->l_flags |= LDLM_FL_KMS_IGNORE);
 
 		if (mdc_set_dom_lock_data(matched, einfo->ei_cbdata)) {
 			*flags |= LDLM_FL_LVB_READY;
@@ -1484,7 +1484,7 @@ static int mdc_object_ast_clear(struct ldlm_lock *lock, void *data)
 	LASSERT(lock->l_resource->lr_type == LDLM_IBITS);
 	memcpy(lvb, &oinfo->loi_lvb, sizeof(oinfo->loi_lvb));
 	cl_object_attr_unlock(&osc->oo_cl);
-	ldlm_clear_lvb_cached(lock);
+	(lock->l_flags &= ~LDLM_FL_LVB_CACHED);
 
 	RETURN(LDLM_ITER_CONTINUE);
 }