Re: [PATCH 09/18] xfs: move the di_nblocks field to struct xfs_inode

On Thu, Mar 25, 2021 at 09:39:52AM +0100, Christoph Hellwig wrote:

quoted

quoted

@@ -194,7 +194,7 @@ xfs_iformat_btree(
 		     nrecs == 0 ||
 		     XFS_BMDR_SPACE_CALC(nrecs) >
 					XFS_DFORK_SIZE(dip, mp, whichfork) ||
-		     ifp->if_nextents > ip->i_d.di_nblocks) ||
+		     ifp->if_nextents > ip->i_nblocks) ||
 		     level == 0 || level > XFS_BTREE_MAXLEVELS) {

Minor merge conflict here with "xfs: validate ag btree levels using the
precomputed values", but I can fix that up.  Everything else looks like
a straightforward conversion.

Is that patch queue up somewhere so that I could rebase ontop of it?

I pushed for-next just now. :)

--D