p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfs: introduce a new xfs_inode_has_cow_data helper 

We have a few places that already check if an inode has actual data in
the COW fork to avoid work on reflink inodes that do not actually have
outstanding COW blocks.  There are a few more places that can avoid
working if doing the same check, so add a documented helper for this
condition and use it in all places where it makes sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2018-07-17 16:51:51 -07:00 committed by Darrick J. Wong
parent 3ba738df25
commit 51d6269030
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_aops.c
View File

@ -338,7 +338,7 @@ xfs_map_blocks(
imap_valid = offset_fsb >= wpc->imap.br_startoff && imap_valid = offset_fsb >= wpc->imap.br_startoff &&
offset_fsb < wpc->imap.br_startoff + wpc->imap.br_blockcount; offset_fsb < wpc->imap.br_startoff + wpc->imap.br_blockcount;
if (imap_valid && if (imap_valid &&
(!xfs_is_reflink_inode(ip) || wpc->io_type == XFS_IO_COW)) (!xfs_inode_has_cow_data(ip) || wpc->io_type == XFS_IO_COW))
return 0; return 0;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
@ -363,7 +363,7 @@ xfs_map_blocks(
* Check if this is offset is covered by a COW extents, and if yes use * Check if this is offset is covered by a COW extents, and if yes use
* it directly instead of looking up anything in the data fork. * it directly instead of looking up anything in the data fork.
*/ */
if (xfs_is_reflink_inode(ip) && if (xfs_inode_has_cow_data(ip) &&
xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &imap) && xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &imap) &&
imap.br_startoff <= offset_fsb) { imap.br_startoff <= offset_fsb) {
xfs_iunlock(ip, XFS_ILOCK_SHARED); xfs_iunlock(ip, XFS_ILOCK_SHARED);

2
fs/xfs/xfs_bmap_util.c
View File

@ -1263,7 +1263,7 @@ xfs_prepare_shift(
* we've flushed all the dirty data out to disk to avoid having * we've flushed all the dirty data out to disk to avoid having
* CoW extents at the wrong offsets. * CoW extents at the wrong offsets.
*/ */
if (xfs_is_reflink_inode(ip)) { if (xfs_inode_has_cow_data(ip)) {
error = xfs_reflink_cancel_cow_range(ip, offset, NULLFILEOFF, error = xfs_reflink_cancel_cow_range(ip, offset, NULLFILEOFF,
true); true);
if (error) if (error)

10
fs/xfs/xfs_icache.c
View File

@ -1697,14 +1697,13 @@ xfs_inode_clear_eofblocks_tag(
*/ */
static bool static bool
xfs_prep_free_cowblocks( xfs_prep_free_cowblocks(
struct xfs_inode *ip, struct xfs_inode *ip)
struct xfs_ifork *ifp)
{ {
/* /*
* Just clear the tag if we have an empty cow fork or none at all. It's * Just clear the tag if we have an empty cow fork or none at all. It's
* possible the inode was fully unshared since it was originally tagged. * possible the inode was fully unshared since it was originally tagged.
*/ */
if (!xfs_is_reflink_inode(ip) || !ifp->if_bytes) { if (!xfs_inode_has_cow_data(ip)) {
trace_xfs_inode_free_cowblocks_invalid(ip); trace_xfs_inode_free_cowblocks_invalid(ip);
xfs_inode_clear_cowblocks_tag(ip); xfs_inode_clear_cowblocks_tag(ip);
return false; return false;
@ -1742,11 +1741,10 @@ xfs_inode_free_cowblocks(
void *args) void *args)
{ {
struct xfs_eofblocks *eofb = args; struct xfs_eofblocks *eofb = args;
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
int match; int match;
int ret = 0; int ret = 0;
if (!xfs_prep_free_cowblocks(ip, ifp)) if (!xfs_prep_free_cowblocks(ip))
return 0; return 0;
if (eofb) { if (eofb) {
@ -1771,7 +1769,7 @@ xfs_inode_free_cowblocks(
* Check again, nobody else should be able to dirty blocks or change * Check again, nobody else should be able to dirty blocks or change
* the reflink iflag now that we have the first two locks held. * the reflink iflag now that we have the first two locks held.
*/ */
if (xfs_prep_free_cowblocks(ip, ifp)) if (xfs_prep_free_cowblocks(ip))
ret = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, false); ret = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, false);
xfs_iunlock(ip, XFS_MMAPLOCK_EXCL); xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);

3
fs/xfs/xfs_inode.c
View File

@ -1832,7 +1832,6 @@ xfs_inactive(
xfs_inode_t *ip) xfs_inode_t *ip)
{ {
struct xfs_mount *mp; struct xfs_mount *mp;
struct xfs_ifork *cow_ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
int error; int error;
int truncate = 0; int truncate = 0;
@ -1853,7 +1852,7 @@ xfs_inactive(
return; return;
/* Try to clean out the cow blocks if there are any. */ /* Try to clean out the cow blocks if there are any. */
if (xfs_is_reflink_inode(ip) && cow_ifp->if_bytes > 0) if (xfs_inode_has_cow_data(ip))
xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, true); xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, true);
if (VFS_I(ip)->i_nlink != 0) { if (VFS_I(ip)->i_nlink != 0) {

9
fs/xfs/xfs_inode.h
View File

@ -198,6 +198,15 @@ static inline bool xfs_is_reflink_inode(struct xfs_inode *ip)
return ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK; return ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK;
} }
/*
* Check if an inode has any data in the COW fork. This might be often false
* even for inodes with the reflink flag when there is no pending COW operation.
*/
static inline bool xfs_inode_has_cow_data(struct xfs_inode *ip)
{
return ip->i_cowfp && ip->i_cowfp->if_bytes;
}
/* /*
* In-core inode flags. * In-core inode flags.
*/ */

2
fs/xfs/xfs_reflink.c
View File

@ -478,7 +478,7 @@ xfs_reflink_cancel_cow_blocks(
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
int error = 0; int error = 0;
if (!xfs_is_reflink_inode(ip)) if (!xfs_inode_has_cow_data(ip))
return 0; return 0;
if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got)) if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got))
return 0; return 0;