On Mon, Oct 28, 2024 at 01:37:12AM -0700, Christoph Hellwig wrote: > > + if (is_rtfile(iocur_top->data)) > > + set_rt_cur(&typtab[type], (int64_t)dfsbno << mp->m_blkbb_log, > > Shouldn't this be xfs_rtb_to_daddr? This series is for xfsprogs 6.12; the helpers adding rtb <-> daddr conversions won't get added until the rtgroups cleanups that are headed towards 6.13. I could try to fling a patch for 6.12 to add these trivial helpers, hope that I can persuade Carlos to persuade Linus to add that for 6.12-rc6, then wait until next week to port the new helper patch to xfsprogs and *then* resend this series. Then I'd rebase all the 6.13 stuff, initiate another round of review, and maybe we can push metadir into 6.13 for-next after rc6. Good grief that sounds incredibly bureaucratic for a left and right shift helper. I'm going to add rtb_to_daddr and daddr_to_rtb to db/block.h for now and update them to the xfs_ versions in the metadir patchset. > > diff --git a/db/faddr.c b/db/faddr.c > > index ec4aae68bb5a81..fd65b86b5e915d 100644 > > --- a/db/faddr.c > > +++ b/db/faddr.c > > @@ -323,7 +323,9 @@ fa_drtbno( > > dbprintf(_("null block number, cannot set new addr\n")); > > return; > > } > > - /* need set_cur to understand rt subvolume */ > > + > > + set_rt_cur(&typtab[next], (int64_t)XFS_FSB_TO_BB(mp, bno), blkbb, > > + DB_RING_ADD, NULL); > > Same here? Yep. --D