From: Darrick J. Wong <djwong@xxxxxxxxxx> libxfs_buf_get_uncached doesn't take a daddr argument, so don't pass one as the flags argument. Also take the opportunity to use xfs_buf_set_daddr to set the actual disk address. Cc: <linux-xfs@xxxxxxxxxxxxxxx> # v6.13.0 Fixes: 0d7c490474e5e5 ("mkfs: format realtime groups") Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx> --- mkfs/xfs_mkfs.c | 5 ++--- repair/rt.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index f5556fcc4040ed..79ce68e96bd2a5 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -4989,15 +4989,14 @@ write_rtsb( } error = -libxfs_buf_get_uncached(mp->m_rtdev_targp, - XFS_FSB_TO_BB(mp, 1), XFS_RTSB_DADDR, - &rtsb_bp); + XFS_FSB_TO_BB(mp, 1), 0, &rtsb_bp); if (error) { fprintf(stderr, _("%s: couldn't grab realtime superblock buffer\n"), progname); exit(1); } - rtsb_bp->b_maps[0].bm_bn = XFS_RTSB_DADDR; + xfs_buf_set_daddr(rtsb_bp, XFS_RTSB_DADDR); rtsb_bp->b_ops = &xfs_rtsb_buf_ops; libxfs_update_rtsb(rtsb_bp, sb_bp); diff --git a/repair/rt.c b/repair/rt.c index 5ba04919bc3ccf..12cc9bb8a88aeb 100644 --- a/repair/rt.c +++ b/repair/rt.c @@ -616,12 +616,12 @@ rewrite_rtsb( _("couldn't grab primary sb to update realtime sb\n")); error = -libxfs_buf_get_uncached(mp->m_rtdev_targp, - XFS_FSB_TO_BB(mp, 1), XFS_RTSB_DADDR, &rtsb_bp); + XFS_FSB_TO_BB(mp, 1), 0, &rtsb_bp); if (error) do_error( _("couldn't grab realtime superblock\n")); - rtsb_bp->b_maps[0].bm_bn = XFS_RTSB_DADDR; + xfs_buf_set_daddr(rtsb_bp, XFS_RTSB_DADDR); rtsb_bp->b_ops = &xfs_rtsb_buf_ops; libxfs_update_rtsb(rtsb_bp, sb_bp);