xfs
[Top] [All Lists]

Re: [PATCH] xfsprogs: remove incorrect l_sectBBsize assignment in xfs_re

To: Eric Sandeen <sandeen@xxxxxxxxxx>
Subject: Re: [PATCH] xfsprogs: remove incorrect l_sectBBsize assignment in xfs_repair
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Tue, 15 Oct 2013 08:07:01 +1100
Cc: xfs-oss <xfs@xxxxxxxxxxx>, Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5252F0D4.8090209@xxxxxxxxxx>
References: <5252F0D4.8090209@xxxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
On Mon, Oct 07, 2013 at 12:35:16PM -0500, Eric Sandeen wrote:
> Commit e0607266 xfsprogs: add crc format support to repair
> 
> added a 2nd assignment to l_sectBBsize:
> 
>       log.l_sectBBsize = 1 << mp->m_sb.sb_logsectlog;
> 
> which is incorrect; sb_logsectlog is log2 of the sector size,
> in bytes; l_sectBBsize is the size of the log sector in
> 512-byte units.

Yes, that is wrong. It looks like a hunk of code I didn't cleanup
properly when I did some patch reordering and rebasing. IIRC, the
above patch was written before I realised that all of xfsprogs
failed to handle log sector sizes != 512 bytes properly, and that
the log CRC code required that to work correctly. Hence a generic
fix to the problem was added in commit:

999f0b9 xfsprogs: updata libxlog to current kernel code

Which fixed repair, db and logprint. That is where this code:

> Just remove the incorrect assignment; it was already properly
> assigned about 12 lines prior:
> 
>         log.l_sectBBsize  = BTOBB(x.lbsize);
> 
> and things work again.

came from.

Basically, I didn't clean all the random fix fragments out of the
repair patch, and so I broke log secotr size != 512 byte cases for
repair again....

> Reporteed-by: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>

Reported-by the reportee. ;)

> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> 
> diff --git a/repair/phase2.c b/repair/phase2.c
> index a62854e..2817fed 100644
> --- a/repair/phase2.c
> +++ b/repair/phase2.c
> @@ -64,7 +64,6 @@ zero_log(xfs_mount_t *mp)
>               ASSERT(mp->m_sb.sb_logsectlog >= BBSHIFT);
>       }
>       log.l_sectbb_mask = (1 << log.l_sectbb_log) - 1;
> -     log.l_sectBBsize = 1 << mp->m_sb.sb_logsectlog;
>  
>       if ((error = xlog_find_tail(&log, &head_blk, &tail_blk))) {
>               do_warn(_("zero_log: cannot find log head/tail "

Looks good,

Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
-- 
Dave Chinner
david@xxxxxxxxxxxxx

<Prev in Thread] Current Thread [Next in Thread>