Whamcloud - gitweb
LU-18136 target: remove LDLM_LOCK_* macros 10/56010/2
authorTimothy Day <timday@amazon.com>
Tue, 13 Aug 2024 02:22:04 +0000 (22:22 -0400)
committerOleg Drokin <green@whamcloud.com>
Fri, 23 Aug 2024 22:05:40 +0000 (22:05 +0000)
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: I24c3f10d6225564ae448c0a23c1bd499e4ba7969
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56010
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>
lustre/target/tgt_main.c

index 187e631..079496d 100644 (file)
@@ -384,7 +384,7 @@ void tgt_save_slc_lock(struct lu_target *lut, struct ldlm_lock *lock,
        if (ldlm_is_cbpending(lock)) {
                /* if it was canceld by server, don't save, because remote MDT
                 * will do Sync-on-Cancel. */
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        } else {
                lock->l_transno = transno;
                /* if this lock is in the list already, there are two operations
@@ -393,7 +393,7 @@ void tgt_save_slc_lock(struct lu_target *lut, struct ldlm_lock *lock,
                if (list_empty(&lock->l_slc_link))
                        list_add_tail(&lock->l_slc_link, &lut->lut_slc_locks);
                else
-                       LDLM_LOCK_PUT(lock);
+                       ldlm_lock_put(lock);
        }
        unlock_res_and_lock(lock);
        spin_unlock(&lut->lut_slc_locks_guard);
@@ -419,7 +419,7 @@ void tgt_discard_slc_lock(struct lu_target *lut, struct ldlm_lock *lock)
                LASSERT(ldlm_is_cbpending(lock));
                list_del_init(&lock->l_slc_link);
                lock->l_transno = 0;
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
        unlock_res_and_lock(lock);
        spin_unlock(&lut->lut_slc_locks_guard);
@@ -466,7 +466,7 @@ void tgt_cancel_slc_locks(struct lu_target *lut, __u64 transno)
                list_del_init(&lock->l_slc_link);
                ldlm_lock2handle(lock, &lockh);
                ldlm_cli_cancel(&lockh, LCF_ASYNC);
-               LDLM_LOCK_PUT(lock);
+               ldlm_lock_put(lock);
        }
 }