summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-10-10 16:47:32 +1100
committerDave Chinner <david@fromorbit.com>2016-10-10 16:47:32 +1100
commit63646fc58d666f149b85ccf470bfc1576a779d4c (patch)
treedc640908f7a21bf0f81f0b3e51a05d5f583e9ec1 /fs/xfs/xfs_super.c
parent1f08af52e7c981e9877796a2d90b0e0f08666945 (diff)
downloadop-kernel-dev-63646fc58d666f149b85ccf470bfc1576a779d4c.zip
op-kernel-dev-63646fc58d666f149b85ccf470bfc1576a779d4c.tar.gz
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>
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 72bde28..ade4691 100644
--- 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);
OpenPOWER on IntegriCloud