[XFS] Fix merge conflict in fs/xfs/xfs_rename.c