xfs: check inode reflink flag before calling reflink functions

There are a couple of places where we don't check the inode's
reflink flag before calling into the reflink code.  Fix those,
and add some asserts so we don't make this mistake again.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reported-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 685c419ae01198cc30108604dcb4d65c2fcee519..9c58b4a83248cb0e0d08f4007ef6bc4b31507a2d 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -624,6 +624,7 @@ xfs_reflink_cancel_cow_range(
        int                     error;
 
        trace_xfs_reflink_cancel_cow_range(ip, offset, count);
+       ASSERT(xfs_is_reflink_inode(ip));
 
        offset_fsb = XFS_B_TO_FSBT(ip->i_mount, offset);
        if (count == NULLFILEOFF)
@@ -1510,8 +1511,7 @@ xfs_reflink_clear_inode_flag(
        int                     nmaps;
        int                     error = 0;
 
-       if (!(ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK))
-               return 0;
+       ASSERT(xfs_is_reflink_inode(ip));
 
        fbno = 0;
        end = XFS_B_TO_FSB(mp, i_size_read(VFS_I(ip)));

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 72bde2811bd7e58723b22710bbf45116bc134dac..ade4691e3f7403ca65241856b355d0cb0f5709a0 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -947,11 +947,13 @@ xfs_fs_destroy_inode(
        XFS_STATS_INC(ip->i_mount, vn_rele);
        XFS_STATS_INC(ip->i_mount, vn_remove);
 
-       error = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF);
-       if (error && !XFS_FORCED_SHUTDOWN(ip->i_mount))
-               xfs_warn(ip->i_mount, "Error %d while evicting CoW blocks "
-                               "for inode %llu.",
-                               error, ip->i_ino);
+       if (xfs_is_reflink_inode(ip)) {
+               error = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF);
+               if (error && !XFS_FORCED_SHUTDOWN(ip->i_mount))
+                       xfs_warn(ip->i_mount,
+"Error %d while evicting CoW blocks for inode %llu.",
+                                       error, ip->i_ino);
+       }
 
        xfs_inactive(ip);