From: Yang Li <yang.lee@linux.alibaba.com>
To: djwong@kernel.org
Cc: jefflexu@linux.alibaba.com, linux-xfs@vger.kernel.org,
linux-kernel@vger.kernel.org,
Yang Li <yang.lee@linux.alibaba.com>
Subject: [PATCH next] xfs: fix inconsistent indenting of xlog_verify_tail_lsn()
Date: Fri, 18 Aug 2023 10:02:50 +0800 [thread overview]
Message-ID: <20230818020250.35427-1-yang.lee@linux.alibaba.com> (raw)
Fix smatch warning:
fs/xfs/xfs_log.c:3598 xlog_verify_tail_lsn() warn: inconsistent indenting
Also fix several style violations mentioned in [1].
[1] https://lore.kernel.org/linux-xfs/20210902233137.GB1826899@dread.disaster.area/
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
fs/xfs/xfs_log.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 79004d193e54..d197534cd3b3 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3593,23 +3593,23 @@ xlog_verify_tail_lsn(
struct xlog_in_core *iclog)
{
xfs_lsn_t tail_lsn = be64_to_cpu(iclog->ic_header.h_tail_lsn);
- int blocks;
+ int blocks, ic_blocks;
- if (CYCLE_LSN(tail_lsn) == log->l_prev_cycle) {
- blocks =
- log->l_logBBsize - (log->l_prev_block - BLOCK_LSN(tail_lsn));
- if (blocks < BTOBB(iclog->ic_offset)+BTOBB(log->l_iclog_hsize))
- xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
- } else {
- ASSERT(CYCLE_LSN(tail_lsn)+1 == log->l_prev_cycle);
+ if (CYCLE_LSN(tail_lsn) == log->l_prev_cycle) {
+ blocks = log->l_logBBsize -
+ (log->l_prev_block - BLOCK_LSN(tail_lsn));
+ ic_blocks = BTOBB(iclog->ic_offset) + BTOBB(log->l_iclog_hsize);
+ } else {
+ ASSERT(CYCLE_LSN(tail_lsn) + 1 == log->l_prev_cycle);
- if (BLOCK_LSN(tail_lsn) == log->l_prev_block)
- xfs_emerg(log->l_mp, "%s: tail wrapped", __func__);
+ if (BLOCK_LSN(tail_lsn) == log->l_prev_block)
+ xfs_emerg(log->l_mp, "%s: tail wrapped", __func__);
- blocks = BLOCK_LSN(tail_lsn) - log->l_prev_block;
- if (blocks < BTOBB(iclog->ic_offset) + 1)
+ blocks = BLOCK_LSN(tail_lsn) - log->l_prev_block;
+ ic_blocks = BTOBB(iclog->ic_offset) + 1;
+ }
+ if (blocks < ic_blocks)
xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
- }
}
/*
--
2.20.1.7.g153144c
next reply other threads:[~2023-08-18 2:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 2:02 Yang Li [this message]
2023-08-18 15:25 ` [PATCH next] xfs: fix inconsistent indenting of xlog_verify_tail_lsn() Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230818020250.35427-1-yang.lee@linux.alibaba.com \
--to=yang.lee@linux.alibaba.com \
--cc=djwong@kernel.org \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox