From 832fb0e2b18f7ffe6318695612e90d2bf77e1a16 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Thu, 19 Dec 2024 23:13:50 -0500 Subject: [PATCH] LU-16565 osc: 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 Change-Id: I40f627f5dbaa072b4a1e91adbca1c88d727fb84d Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57544 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/osc/osc_lock.c | 8 ++++---- lustre/osc/osc_object.c | 2 +- lustre/osc/osc_request.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c index 6a8081e..ecc9ae7 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -82,7 +82,7 @@ static inline int osc_lock_invariant(struct osc_lock *ols) * ast. */ if (! ergo(olock != NULL && ols->ols_state < OLS_CANCELLED, - !ldlm_is_destroyed(olock))) + !(olock->l_flags & LDLM_FL_DESTROYED))) return 0; if (! ergo(ols->ols_state == OLS_GRANTED, @@ -224,11 +224,11 @@ static void osc_lock_granted(const struct lu_env *env, struct osc_lock *oscl, descr->cld_gid = ext->gid; /* 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); osc_lock_lvb_update(env, osc, dlmlock, NULL); - ldlm_set_lvb_cached(dlmlock); + (dlmlock->l_flags |= LDLM_FL_LVB_CACHED); } LINVRNT(osc_lock_invariant(oscl)); } @@ -392,7 +392,7 @@ static int osc_dlm_blocking_ast0(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; diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c index 20c7897..da44810 100644 --- a/lustre/osc/osc_object.c +++ b/lustre/osc/osc_object.c @@ -213,7 +213,7 @@ static int osc_object_ast_clear(struct ldlm_lock *lock, void *data) cl_object_attr_lock(&osc->oo_cl); 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); } diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 5c64f94..fcc64cf 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3298,10 +3298,10 @@ int osc_match_base(const struct lu_env *env, struct obd_export *exp, LASSERT(lock != NULL); if (osc_set_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); osc_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 { @@ -3736,7 +3736,7 @@ int osc_ldlm_resource_invalidate(struct cfs_hash *hs, struct cfs_hash_bd *bd, * by the 2nd round of ldlm_namespace_clean() call in * osc_import_event(). */ - ldlm_clear_cleaned(lock); + (lock->l_flags &= ~LDLM_FL_CLEANED); } unlock_res(res); -- 1.8.3.1