On Fri, Aug 25, 2017 at 11:05:54AM -0400, Brian Foster wrote: > Extent swap uses xfs_btree_visit_blocks() to fix up bmbt block > owners on v5 (!rmapbt) filesystems. The bmbt scan uses > xfs_btree_lookup_get_block() to read bmbt blocks which verifies the > current owner of the block against the parent inode of the bmbt. > This works during extent swap because the bmbt owners are updated to > the opposite inode number before the inode extent forks are swapped. > > The modified bmbt blocks are marked as ordered buffers which allows > everything to commit in a single transaction. If the transaction > commits to the log and the system crashes such that recovery of the > extent swap is required, log recovery restarts the bmbt scan to fix > up any bmbt blocks that may have not been written back before the > crash. The log recovery bmbt scan occurs after the inode forks have > been swapped, however. This causes the bmbt block owner verification > to fail, leads to log recovery failure and requires xfs_repair to > zap the log to recover. > > Define a new invalid inode owner flag to inform the btree block > lookup mechanism that the current inode may be invalid with respect > to the current owner of the bmbt block. Set this flag on the cursor > used for change owner scans to allow this operation to work at > runtime and during log recovery. > > Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx> > --- > fs/xfs/libxfs/xfs_bmap_btree.c | 1 + > fs/xfs/libxfs/xfs_btree.c | 1 + > fs/xfs/libxfs/xfs_btree.h | 3 ++- > 3 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c > index 85de225..6f05995 100644 > --- a/fs/xfs/libxfs/xfs_bmap_btree.c > +++ b/fs/xfs/libxfs/xfs_bmap_btree.c > @@ -858,6 +858,7 @@ xfs_bmbt_change_owner( > cur = xfs_bmbt_init_cursor(ip->i_mount, tp, ip, whichfork); > if (!cur) > return -ENOMEM; > + cur->bc_private.b.flags |= XFS_BTCUR_BPRV_INVALIDINO; > > error = xfs_btree_change_owner(cur, new_owner, buffer_list); > xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR); > diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c > index 0b7905a..d06b04d 100644 > --- a/fs/xfs/libxfs/xfs_btree.c > +++ b/fs/xfs/libxfs/xfs_btree.c > @@ -1791,6 +1791,7 @@ xfs_btree_lookup_get_block( > > /* Check the inode owner since the verifiers don't. */ > if (xfs_sb_version_hascrc(&cur->bc_mp->m_sb) && > + !(cur->bc_private.b.flags & XFS_BTCUR_BPRV_INVALIDINO) && > (cur->bc_flags & XFS_BTREE_LONG_PTRS) && > be64_to_cpu((*blkp)->bb_u.l.bb_owner) != > cur->bc_private.b.ip->i_ino) > diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h > index 9c95e96..c803ddc 100644 > --- a/fs/xfs/libxfs/xfs_btree.h > +++ b/fs/xfs/libxfs/xfs_btree.h > @@ -233,7 +233,8 @@ typedef struct xfs_btree_cur > short forksize; /* fork's inode space */ > char whichfork; /* data or attr fork */ > char flags; /* flags */ > -#define XFS_BTCUR_BPRV_WASDEL 1 /* was delayed */ > +#define XFS_BTCUR_BPRV_WASDEL (1<<0) /* was delayed */ > +#define XFS_BTCUR_BPRV_INVALIDINO (1<<1) /* for ext swap */ I think I'd call this invalid owner since that's the name of the field that we're (not) validating. Otherwise looks fine, Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --D > } b; > } bc_private; /* per-btree type data */ > } xfs_btree_cur_t; > -- > 2.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
