On Mon, Jan 22, 2024 at 08:10:44PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> On a disk with 4096-byte LBAs, the xfs_db 'type data' subcommand doesn't
> work:
>
> # xfs_io -c 'sb' -c 'type data' /dev/sda
> xfs_db: read failed: Invalid argument
> no current object
>
> The cause of this is the hardcoded initialization of bb_count when we're
> setting type data -- it should be the filesystem sector size, not just 1.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Looks good:
Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
> ---
> db/block.c | 7 ++++---
> db/io.c | 3 ++-
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/db/block.c b/db/block.c
> index f234fcb4edcb..c847a91dd22f 100644
> --- a/db/block.c
> +++ b/db/block.c
> @@ -149,6 +149,7 @@ daddr_f(
> int64_t d;
> char *p;
> int c;
> + int bb_count = BTOBB(mp->m_sb.sb_sectsize);
> xfs_rfsblock_t max_daddrs = mp->m_sb.sb_dblocks;
> enum daddr_target tgt = DT_DATA;
>
> @@ -202,13 +203,13 @@ daddr_f(
> ASSERT(typtab[TYP_DATA].typnm == TYP_DATA);
> switch (tgt) {
> case DT_DATA:
> - set_cur(&typtab[TYP_DATA], d, 1, DB_RING_ADD, NULL);
> + set_cur(&typtab[TYP_DATA], d, bb_count, DB_RING_ADD, NULL);
> break;
> case DT_RT:
> - set_rt_cur(&typtab[TYP_DATA], d, 1, DB_RING_ADD, NULL);
> + set_rt_cur(&typtab[TYP_DATA], d, bb_count, DB_RING_ADD, NULL);
> break;
> case DT_LOG:
> - set_log_cur(&typtab[TYP_DATA], d, 1, DB_RING_ADD, NULL);
> + set_log_cur(&typtab[TYP_DATA], d, bb_count, DB_RING_ADD, NULL);
> break;
> }
> return 0;
> diff --git a/db/io.c b/db/io.c
> index 580d34015868..3841c0dcb86e 100644
> --- a/db/io.c
> +++ b/db/io.c
> @@ -681,7 +681,8 @@ void
> set_iocur_type(
> const typ_t *type)
> {
> - int bb_count = 1; /* type's size in basic blocks */
> + /* type's size in basic blocks */
> + int bb_count = BTOBB(mp->m_sb.sb_sectsize);
> int boff = iocur_top->boff;
>
> /*
>
