@@ -663,7 +663,7 @@ xfs_file_buffered_aio_write(
xfs_iunlock(ip, iolock);
eofb.eof_flags = XFS_EOF_FLAGS_SYNC;
xfs_icache_free_eofblocks(ip->i_mount, &eofb);
- xfs_icache_free_cowblocks(ip->i_mount, &eofb);
+ xfs_icache_free_cowblocks(ip->i_mount, &eofb, SYNC_WAIT);
goto write_retry;
}
@@ -944,7 +944,7 @@ xfs_cowblocks_worker(
if (!sb_start_write_trylock(mp->m_super))
return;
- xfs_icache_free_cowblocks(mp, NULL);
+ xfs_icache_free_cowblocks(mp, NULL, SYNC_TRYLOCK);
sb_end_write(mp->m_super);
xfs_queue_cowblocks(mp);
@@ -1557,7 +1557,7 @@ xfs_inode_free_quota_blocks(
if (scan) {
xfs_icache_free_eofblocks(ip->i_mount, &eofb);
- xfs_icache_free_cowblocks(ip->i_mount, &eofb);
+ xfs_icache_free_cowblocks(ip->i_mount, &eofb, SYNC_WAIT);
}
return scan;
@@ -1767,12 +1767,9 @@ xfs_inode_free_cowblocks(
int
xfs_icache_free_cowblocks(
struct xfs_mount *mp,
- struct xfs_eofblocks *eofb)
+ struct xfs_eofblocks *eofb,
+ int flags)
{
- int flags = SYNC_TRYLOCK;
-
- if (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC))
- flags = SYNC_WAIT;
return xfs_inode_ag_iterator_tag(mp, xfs_inode_free_cowblocks, flags,
eofb, XFS_ICI_COWBLOCKS_TAG);
}
@@ -66,7 +66,8 @@ void xfs_queue_eofblocks(struct xfs_mount *);
void xfs_inode_set_cowblocks_tag(struct xfs_inode *ip);
void xfs_inode_clear_cowblocks_tag(struct xfs_inode *ip);
-int xfs_icache_free_cowblocks(struct xfs_mount *, struct xfs_eofblocks *);
+int xfs_icache_free_cowblocks(struct xfs_mount *mp, struct xfs_eofblocks *eofb,
+ int flags);
void xfs_cowblocks_worker(struct work_struct *);
void xfs_queue_cowblocks(struct xfs_mount *);
@@ -1670,7 +1670,7 @@ xfs_remount_ro(
xfs_stop_block_reaping(mp);
/* Get rid of any leftover CoW reservations... */
- error = xfs_icache_free_cowblocks(mp, NULL);
+ error = xfs_icache_free_cowblocks(mp, NULL, SYNC_TRYLOCK);
if (error) {
xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
return error;
Pass the SYNC_* flags directly instead of hiding the information in the eofblocks structure. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_icache.c | 11 ++++------- fs/xfs/xfs_icache.h | 3 ++- fs/xfs/xfs_super.c | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-)