Messages in this thread Patch in this message | | | Date | Fri, 3 Sep 2021 09:31:37 +1000 | From | Dave Chinner <> | Subject | Re: [PATCH] xfs: clean up some inconsistent indenting |
| |
On Thu, Sep 02, 2021 at 11:52:19PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > There are bunch of statements where the indentation is not correct, > clean these up. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > fs/xfs/xfs_log.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-)
Good idea, but I see no point in only fixing one of the many style violations this ancient debug code has whilst introducing new ones (i.e line lengths > 80 columns).
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index f6cd2d4aa770..9afc58a1a9ee 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -3700,21 +3700,20 @@ 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 (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 (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__); > - } > + if (CYCLE_LSN(tail_lsn) == log->l_prev_cycle) { > + blocks = log->l_logBBsize - (log->l_prev_block - BLOCK_LSN(tail_lsn));
Line length.
> + if (blocks < BTOBB(iclog->ic_offset)+BTOBB(log->l_iclog_hsize))
Lack of whitespace around "="
> + xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
Line length.
> + } else {
Return from the if {} block rather than using an else statement, and the indent of this block doesn't change:
> + ASSERT(CYCLE_LSN(tail_lsn)+1 == log->l_prev_cycle);
Whitespace. > + > + 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__);
And because this doesn't need indent because of the return above, it won't violate line length limits...
Cheers,
Dave. -- Dave Chinner david@fromorbit.com
| |