Re: [PATCH 2/3] xfs: RT bitmap and summary buffers are not typed

Eric Sandeen
2016-02-02T01:26:21Z

On 2/1/16 6:39 PM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> When logging buffers, we attach a type to them that follows the
> buffer all the way into the log and is used to identify the buffer
> contents in log recovery. Both the realtime summary buffers and the
> bitmap buffers do not have types defined or set, so when we try to
> log them we see assert failure:
>
> XFS: Assertion failed: (bip->bli_flags & XFS_BLI_STALE) || (xfs_blft_from_flags(&bip->__bli_format) > XFS_BLFT_UNKNOWN_BUF && xfs_blft_from_flags(&bip->__bli_format) < XFS_BLFT_MAX_BUF), file: fs/xfs/xfs_buf_item.c, line: 294
>
> Fix this by adding buffer log format types for these buffers, and
> add identification support into log recovery for them.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
> fs/xfs/libxfs/xfs_log_format.h | 2 ++
> fs/xfs/libxfs/xfs_rtbitmap.c | 3 +++
> fs/xfs/xfs_log_recover.c | 5 +++++
> 3 files changed, 10 insertions(+)
>
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index 03f90b9..d54a801 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -496,6 +496,8 @@ enum xfs_blft {
> XFS_BLFT_ATTR_LEAF_BUF,
> XFS_BLFT_ATTR_RMT_BUF,
> XFS_BLFT_SB_BUF,
> + XFS_BLFT_RTBITMAP_BUF,
> + XFS_BLFT_RTSUMMARY_BUF,
> XFS_BLFT_MAX_BUF = (1 << XFS_BLFT_BITS),
> };
>
> diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
> index acc71dd..bfa7b85 100644
> --- a/fs/xfs/libxfs/xfs_rtbitmap.c
> +++ b/fs/xfs/libxfs/xfs_rtbitmap.c
> @@ -71,6 +71,9 @@ xfs_rtbuf_get(
> mp->m_bsize, 0, &bp, NULL);
> if (error)
> return error;
> +
> + xfs_trans_buf_set_type(tp, bp, issum ? XFS_BLFT_RTSUMMARY_BUF
> + : XFS_BLFT_RTBITMAP_BUF);
> *bpp = bp;
> return 0;
> }
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 464c5d4..e2d7533 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -2473,6 +2473,11 @@ xlog_recover_validate_buf_type(
> }
> bp->b_ops = &xfs_sb_buf_ops;
> break;
> + case XFS_BLFT_RTBITMAP_BUF:
> + case XFS_BLFT_RTSUMMARY_BUF:
> + /* no verification of RT buffers is done */
> + bp->b_ops = NULL;
> + break;
> default:
> xfs_warn(mp, "Unknown buffer type %d!",
> xfs_blft_from_flags(buf_f));