From af4b4b59f93b5300232a961c5be1b1807d5e6729 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Thu, 19 Dec 2024 23:14:11 -0500 Subject: [PATCH] LU-16565 mdt: 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: I866c23748a176e8cc4e391e5111d1133caf2988f Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57545 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/mdt/mdt_handler.c | 4 ++-- lustre/mdt/mdt_open.c | 6 +++--- lustre/mdt/mdt_reint.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 37f91e1..8518d01 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -2500,7 +2500,7 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info, req->rq_arrival_time.tv_sec + cfs_fail_val ?: 3); /* Put the lock to the waiting list and force the cancel */ - ldlm_set_ast_sent(lock); + (lock->l_flags |= LDLM_FL_AST_SENT); } /* @@ -3769,7 +3769,7 @@ int mdt_remote_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, ldlm_lock2handle(lock, &lockh); rc = ldlm_cli_cancel(&lockh, - ldlm_is_atomic_cb(lock) ? 0 : LCF_ASYNC); + (lock->l_flags & LDLM_FL_ATOMIC_CB) ? 0 : LCF_ASYNC); if (rc < 0) { CDEBUG(D_INODE, "ldlm_cli_cancel: %d\n", rc); RETURN(rc); diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 8dfc483..4763926 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -1947,7 +1947,7 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o, /* Check if the lease open lease has already canceled */ lock_res_and_lock(lease); - lease_broken = ldlm_is_cancel(lease); + lease_broken = (lease->l_flags & LDLM_FL_CANCEL); unlock_res_and_lock(lease); LDLM_DEBUG(lease, DFID " lease broken? %d", @@ -2264,7 +2264,7 @@ static int mdt_close_handle_layouts(struct mdt_thread_info *info, /* Check if the lease open lease has already canceled */ lock_res_and_lock(lease); - lease_broken = ldlm_is_cancel(lease); + lease_broken = (lease->l_flags & LDLM_FL_CANCEL); unlock_res_and_lock(lease); LDLM_DEBUG(lease, DFID " lease broken? %d", @@ -2450,7 +2450,7 @@ static int mdt_close_resync_done(struct mdt_thread_info *info, /* Check if the lease open lease has already canceled */ lock_res_and_lock(lease); - lease_broken = ldlm_is_cancel(lease); + lease_broken = (lease->l_flags & LDLM_FL_CANCEL); unlock_res_and_lock(lease); LDLM_DEBUG(lease, DFID " lease broken? %d", diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index 8b0987ef..058da76 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -1736,7 +1736,7 @@ static int mdt_migrate_link_parent_lock(struct mdt_thread_info *info, lock = ldlm_handle2lock(&lhl->mlh_rreg_lh); LASSERT(lock != NULL); lock_res_and_lock(lock); - ldlm_set_atomic_cb(lock); + (lock->l_flags |= LDLM_FL_ATOMIC_CB); unlock_res_and_lock(lock); ldlm_lock_put(lock); } @@ -2128,7 +2128,7 @@ static int mdd_migrate_close(struct mdt_thread_info *info, /* check if the lease was already canceled */ lock_res_and_lock(lease); - rc = ldlm_is_cancel(lease); + rc = (lease->l_flags & LDLM_FL_CANCEL); unlock_res_and_lock(lease); if (rc) { @@ -3100,7 +3100,7 @@ static int mdt_reint_resync(struct mdt_thread_info *info, GOTO(out_put_lease, rc = -EBUSY); lock_res_and_lock(lease); - lease_broken = ldlm_is_cancel(lease); + lease_broken = (lease->l_flags & LDLM_FL_CANCEL); unlock_res_and_lock(lease); if (lease_broken) GOTO(out_unlock, rc = -EBUSY); -- 1.8.3.1