From 93784852c8f20b27cf28c5a446480260e4e416ae Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Thu, 5 May 2022 11:15:47 +0300 Subject: [PATCH] LU-15825 ldlm: remove linefeed from LDLM_DEBUG to make the corresponding messages single-line Test-Parameters: trivial Signed-off-by: Alex Zhuravlev Change-Id: I667d27b7bb94c5504b5c0ce2927665d47fbd742c Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47219 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_lockd.c | 2 +- lustre/llite/namei.c | 2 +- lustre/mdt/mdt_handler.c | 2 +- lustre/mdt/mdt_open.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index a5a49f9..e116e9e 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -754,7 +754,7 @@ static int ldlm_handle_ast_error(struct ldlm_lock *lock, * In all such cases errors are ignored. */ LDLM_DEBUG(lock, - "%s AST can't be sent due to a server %s failure or umount process: rc = %d\n", + "%s AST can't be sent due to a server %s failure or umount process: rc = %d", ast_type, req->rq_import->imp_obd->obd_name, rc); } else { diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 7854767..501c5d9 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -255,7 +255,7 @@ static void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) */ if (lock->l_resource->lr_lvb_inode) LDLM_DEBUG(lock, - "can't take inode for the lock (%sevicted)\n", + "can't take inode for the lock (%sevicted)", lock->l_resource->lr_lvb_inode->i_state & I_FREEING ? "" : "not "); RETURN_EXIT; diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 3973064..ae06dbf 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -3608,7 +3608,7 @@ int mdt_remote_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev->ld_site->ls_top_dev); - LDLM_DEBUG(lock, "Revoke remote lock\n"); + LDLM_DEBUG(lock, "Revoke remote lock"); /* discard slc lock here so that it can be cleaned anytime, * especially for cleanup_resource() */ diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 9e40091..00a75e3d 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -2317,7 +2317,7 @@ static int mdt_close_resync_done(struct mdt_thread_info *info, lease_broken = ldlm_is_cancel(lease); unlock_res_and_lock(lease); - LDLM_DEBUG(lease, DFID " lease broken? %d\n", + LDLM_DEBUG(lease, DFID " lease broken? %d", PFID(mdt_object_fid(o)), lease_broken); /* Cancel server side lease. Client side counterpart should -- 1.8.3.1