Re: [PATCH 8/8] xfs: teach xfs_bmapi_remap to accept some bmapi flags

Darrick J. Wong
2018-05-11T23:14:24Z

On Fri, May 11, 2018 at 11:20:27AM -0400, Brian Foster wrote:
> On Thu, May 10, 2018 at 12:18:56PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Teach xfs_bmapi_remap how to map in unwritten extent and to skip rmap
> > updates. This enables us to rebuild real and unwritten extents from the
> > rmapbt.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > fs/xfs/libxfs/xfs_bmap.c | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> >
> > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> > index b63e15a114f3..7660efb5beb0 100644
> > --- a/fs/xfs/libxfs/xfs_bmap.c
> > +++ b/fs/xfs/libxfs/xfs_bmap.c
> > @@ -4543,7 +4543,9 @@ xfs_bmapi_remap(
> > ASSERT(len > 0);
> > ASSERT(len <= (xfs_filblks_t)MAXEXTLEN);
> > ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
> > - ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK)));
> > + ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC |
> > + XFS_BMAPI_NORMAP)));
> > + ASSERT(!(flags & XFS_BMAPI_ATTRFORK) || !(flags & XFS_BMAPI_PREALLOC));
>
> A little confusing.. how about something like?
>
> ASSERT((flags & XFS_BMAPI_ATTRFORK|XFS_BMAPI_PREALLOC) !=
> XFS_BMAPI_ATTRFORK|XFS_BMAPI_PREALLOC);

Ok.

> >
> > if (unlikely(XFS_TEST_ERROR(
> > (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
> > @@ -4581,7 +4583,10 @@ xfs_bmapi_remap(
> > got.br_startoff = bno;
> > got.br_startblock = startblock;
> > got.br_blockcount = len;
> > - got.br_state = XFS_EXT_NORM;
> > + if (flags & XFS_BMAPI_PREALLOC)
> > + got.br_state = XFS_EXT_UNWRITTEN;
> > + else
> > + got.br_state = XFS_EXT_NORM;
>
> It's hard to see the wider picture without any users of this, but I do
> notice that the one current caller appears to have everything passed
> down to it to construct an xfs_bmbt_irec (in fact the data appears to
> come from an irec in the first place).

Later on in the online repair series (which I will send out after the
review for this series concludes) I'll make use of xfs_bmapi_remap to
reconstruct the bmbt from the rmap, which is why I've been busy adding
BMAPI_ATTRFORK, BMAPI_NORMAP, and BMAPI_PREALLOC to this function.

This patch[1] in my branch demonstrates the new uses of this function.

--D

[1] https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=djwong-devel&id=7d8601ba8a938179ec0dae18b8a0848122eaf5e5

> Brian
>
> >
> > error = xfs_bmap_add_extent_hole_real(tp, ip, whichfork, &icur,
> > &cur, &got, &firstblock, dfops, &logflags, flags);
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html