From d7d16447a00be217246f1d73ecaf43a05a832442 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Thu, 12 Oct 2023 21:13:23 +0300 Subject: [PATCH] LU-17188 mdt: remove n from LDLM_DEBUG LDLM_DEBUG() doesn't need n in an extra message Test-Parameters: trivial Signed-off-by: Alex Zhuravlev Change-Id: I5a62cccb0a17b3f878206e8bbec6c1fbe07c4753 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52673 Reviewed-by: Patrick Farrell Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lustre/ldlm/ldlm_extent.c | 4 ++-- lustre/ldlm/ldlm_lockd.c | 6 +++--- lustre/mdc/mdc_dev.c | 2 +- lustre/mdt/mdt_handler.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c index 4cbf502..c734f18 100644 --- a/lustre/ldlm/ldlm_extent.c +++ b/lustre/ldlm/ldlm_extent.c @@ -302,7 +302,7 @@ static void ldlm_extent_policy(struct ldlm_resource *res, ldlm_extent_internal_policy_granted(lock, &new_ex); ldlm_extent_internal_policy_waiting(lock, &new_ex); } else { - LDLM_DEBUG(lock, "Not expanding manually requested lock.\n"); + LDLM_DEBUG(lock, "Not expanding manually requested lock"); new_ex.start = lock->l_policy_data.l_extent.start; new_ex.end = lock->l_policy_data.l_extent.end; /* In case the request is not on correct boundaries, we call @@ -689,7 +689,7 @@ void ldlm_lock_prolong_one(struct ldlm_lock *lock, * let's refresh eviction timer for it. */ timeout = ldlm_bl_timeout_by_rpc(arg->lpa_req); - LDLM_DEBUG(lock, "refreshed to %ds.\n", timeout); + LDLM_DEBUG(lock, "refreshed to %ds", timeout); ldlm_refresh_waiting_lock(lock, timeout); } EXPORT_SYMBOL(ldlm_lock_prolong_one); diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 2f19e7e..e76e04a 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2529,7 +2529,7 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) switch (lustre_msg_get_opc(req->rq_reqmsg)) { case LDLM_BL_CALLBACK: - LDLM_DEBUG(lock, "blocking ast\n"); + LDLM_DEBUG(lock, "blocking ast"); req_capsule_extend(&req->rq_pill, &RQF_LDLM_BL_CALLBACK); if (!ldlm_is_cancel_on_block(lock)) { rc = ldlm_callback_reply(req, 0); @@ -2541,14 +2541,14 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) ldlm_handle_bl_callback(ns, &dlm_req->lock_desc, lock); break; case LDLM_CP_CALLBACK: - LDLM_DEBUG(lock, "completion ast\n"); + LDLM_DEBUG(lock, "completion ast"); req_capsule_extend(&req->rq_pill, &RQF_LDLM_CP_CALLBACK); rc = ldlm_handle_cp_callback(req, ns, dlm_req, lock); if (!CFS_FAIL_CHECK(OBD_FAIL_LDLM_CANCEL_BL_CB_RACE)) ldlm_callback_reply(req, rc); break; case LDLM_GL_CALLBACK: - LDLM_DEBUG(lock, "glimpse ast\n"); + LDLM_DEBUG(lock, "glimpse ast"); req_capsule_extend(&req->rq_pill, &RQF_LDLM_GL_CALLBACK); ldlm_handle_gl_callback(req, ns, dlm_req, lock); break; diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c index b8e094c..8374ca5 100644 --- a/lustre/mdc/mdc_dev.c +++ b/lustre/mdc/mdc_dev.c @@ -998,7 +998,7 @@ static int mdc_lock_init(const struct lu_env *env, struct cl_object *obj, (io->ci_type == CIT_FAULT && !io->u.ci_fault.ft_mkwrite)) osc_lock_set_reader(env, io, obj, ols); - LDLM_DEBUG_NOLOCK("lock %p, mdc lock %p, flags %llx\n", + LDLM_DEBUG_NOLOCK("lock %p, mdc lock %p, flags %llx", lock, ols, ols->ols_flags); RETURN(0); } diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index deb35aa..24b9e81 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -4170,7 +4170,7 @@ static void mdt_save_lock(struct mdt_thread_info *info, struct lustre_handle *h, * from mdt_export_cleanup()->mdt_add_dirty_flag() */ if (likely(req != NULL)) { LDLM_DEBUG(lock, "save lock request %p reply " - "state %p transno %lld\n", req, + "state %p transno %lld", req, req->rq_reply_state, req->rq_transno); if (mdt_cos_is_enabled(mdt)) { mode = LCK_COS; -- 1.8.3.1