xfs: clear cowblocks tag when cow fork is emptied
authorBrian Foster <bfoster@redhat.com>
Mon, 24 Oct 2016 03:21:08 +0000 (14:21 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 24 Oct 2016 03:21:08 +0000 (14:21 +1100)
The background cowblocks scan job takes care of scanning for inodes with
potentially lingering blocks in the cow fork and clearing them out. If
the background scanner reclaims the cow fork blocks, however, it doesn't
immediately clear the cowblocks tag from the inode. Instead, the inode
remains tagged until the background scanner comes around again,
discovers the inode cow fork has no blocks, clears the tag and fires the
trace_xfs_inode_free_cowblocks_invalid() tracepoint to indicate that the
inode may have been incorrectly tagged.

This is not a major functional problem as the tag is ultimately cleared.
Nonetheless, clear the tag when an inode cow fork is explicitly emptied
to avoid the extra round trip through the background scanner and
spurious "invalid" tracepoint.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_reflink.c

index cd308f119e20c15b4bc27d0b33cd1226dad8b5d2..a279b4e7f5feaa83a0cf1fbbfaf1c4d8e393ecbc 100644 (file)
@@ -567,10 +567,14 @@ xfs_reflink_cancel_cow_blocks(
                }
 
                if (++idx >= ifp->if_bytes / sizeof(struct xfs_bmbt_rec))
-                       return 0;
+                       break;
                xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &got);
        }
 
+       /* clear tag if cow fork is emptied */
+       if (!ifp->if_bytes)
+               xfs_inode_clear_cowblocks_tag(ip);
+
        return error;
 }