From 62eac36b7c9390f2696b3b29a990416ccfe29785 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Thu, 19 Dec 2024 23:13:09 -0500 Subject: [PATCH] LU-16565 quota: 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: I364cb11cbbfc00f133e1193204a920233b3a1b37 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57543 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/quota/qmt_handler.c | 2 +- lustre/quota/qsd_lock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/quota/qmt_handler.c b/lustre/quota/qmt_handler.c index 07bea44..18f59b3 100644 --- a/lustre/quota/qmt_handler.c +++ b/lustre/quota/qmt_handler.c @@ -1282,7 +1282,7 @@ static int qmt_dqacq(const struct lu_env *env, struct lu_device *ld, RETURN(-ENOLCK); } - if (ldlm_is_ast_sent(lock)) { + if ((lock->l_flags & LDLM_FL_AST_SENT)) { struct ptlrpc_service_part *svc; timeout_t timeout; diff --git a/lustre/quota/qsd_lock.c b/lustre/quota/qsd_lock.c index 55ee238..4fbd136 100644 --- a/lustre/quota/qsd_lock.c +++ b/lustre/quota/qsd_lock.c @@ -203,7 +203,7 @@ static int qsd_glb_blocking_ast(struct ldlm_lock *lock, * it's just local cancel (for stack clean up or eviction), * don't re-trigger the reintegration. */ - if (!ldlm_is_local_only(lock)) + if (!(lock->l_flags & LDLM_FL_LOCAL_ONLY)) qsd_start_reint_thread(qqi); qqi_putref(qqi); @@ -380,7 +380,7 @@ static int qsd_id_blocking_ast(struct ldlm_lock *lock, * don't release quota space for local cancel (stack clean * up or eviction) */ - if (!ldlm_is_local_only(lock)) { + if (!(lock->l_flags & LDLM_FL_LOCAL_ONLY)) { /* allocate environment */ OBD_ALLOC_PTR(env); if (!env) { -- 1.8.3.1