2022-03-22 00:50:33

by Yang Li

Subject: [PATCH -next] xfs: clean up some inconsistent indenting

Eliminate the follow smatch warning:
fs/xfs/xfs_log.c:3702 xlog_verify_tail_lsn() warn: inconsistent
indenting

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
fs/xfs/xfs_log.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index a8034c0afdf2..5c8843026468 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3699,21 +3699,21 @@ xlog_verify_tail_lsn(
xfs_lsn_t tail_lsn = be64_to_cpu(iclog->ic_header.h_tail_lsn);
int blocks;

- if (CYCLE_LSN(tail_lsn) == log->l_prev_cycle) {
- blocks =
- log->l_logBBsize - (log->l_prev_block - BLOCK_LSN(tail_lsn));
+ 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);
+ } 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)
- xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
- }
+ blocks = BLOCK_LSN(tail_lsn) - log->l_prev_block;
+ if (blocks < BTOBB(iclog->ic_offset) + 1)
+ xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
+ }
}

/*
--
2.20.1.7.g153144c

2022-03-22 03:19:49

by Darrick J. Wong

Subject: Re: [PATCH -next] xfs: clean up some inconsistent indenting

On Tue, Mar 22, 2022 at 08:11:37AM +0800, Yang Li wrote:
> Eliminate the follow smatch warning:
> fs/xfs/xfs_log.c:3702 xlog_verify_tail_lsn() warn: inconsistent
> indenting
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>

https://lore.kernel.org/linux-xfs/[email protected]/
?

--D

> ---
> fs/xfs/xfs_log.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index a8034c0afdf2..5c8843026468 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -3699,21 +3699,21 @@ xlog_verify_tail_lsn(
> xfs_lsn_t tail_lsn = be64_to_cpu(iclog->ic_header.h_tail_lsn);
> int blocks;
>
> - if (CYCLE_LSN(tail_lsn) == log->l_prev_cycle) {
> - blocks =
> - log->l_logBBsize - (log->l_prev_block - BLOCK_LSN(tail_lsn));
> + 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);
> + } 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)
> - xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
> - }
> + blocks = BLOCK_LSN(tail_lsn) - log->l_prev_block;
> + if (blocks < BTOBB(iclog->ic_offset) + 1)
> + xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
> + }
> }
>
> /*
> --
> 2.20.1.7.g153144c
>