xfs: don't check reflink iflag state when checking cow fork

Any inode on a reflink filesystem can have a cow fork, even if the inode
does not have the reflink iflag set.  This happens either because the
inode once had the iflag set but does not now, because we don't free the
incore cow fork until the icache deletes the inode; or because we're
running in alwayscow mode.

Either way, we can collapse both of the xfs_is_reflink_inode calls into
one, and change it to xfs_has_reflink, now that the bmap checker will
return ENOENT if there is no pointer to the incore fork.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index f1e732d..7558891 100644 (file)
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -850,8 +850,8 @@ xchk_bmap(
 
        switch (whichfork) {
        case XFS_COW_FORK:
-               /* No CoW forks on non-reflink inodes/filesystems. */
-               if (!xfs_is_reflink_inode(ip)) {
+               /* No CoW forks on non-reflink filesystems. */
+               if (!xfs_has_reflink(mp)) {
                        xchk_ino_set_corrupt(sc, sc->ip->i_ino);
                        return 0;
                }
@@ -955,8 +955,5 @@ int
 xchk_bmap_cow(
        struct xfs_scrub        *sc)
 {
-       if (!xfs_is_reflink_inode(sc->ip))
-               return -ENOENT;
-
        return xchk_bmap(sc, XFS_COW_FORK);
 }