@@ -685,8 +685,13 @@ xfs_file_buffered_aio_write(
* running at the same time.
*/
if (ret == -EDQUOT && !cleared_space) {
+ int ret2;
+
xfs_iunlock(ip, iolock);
- cleared_space = xfs_blockgc_free_quota(ip);
+ ret2 = xfs_blockgc_free_quota(ip, XFS_EOF_FLAGS_SYNC,
+ &cleared_space);
+ if (ret2)
+ return ret2;
if (cleared_space)
goto write_retry;
iolock = 0;
@@ -1651,26 +1651,30 @@ xfs_start_block_reaping(
* failure. We make a best effort by including each quota under low free space
* conditions (less than 1% free space) in the scan.
*/
-bool
+int
xfs_blockgc_free_quota(
- struct xfs_inode *ip)
+ struct xfs_inode *ip,
+ unsigned int eof_flags,
+ bool *found_work)
{
struct xfs_eofblocks eofb = {0};
struct xfs_dquot *dq;
- bool do_work = false;
+ int error;
+
+ *found_work = false;
/*
- * Run a sync scan to increase effectiveness and use the union filter to
+ * Run a scan to increase effectiveness and use the union filter to
* cover all applicable quotas in a single scan.
*/
- eofb.eof_flags = XFS_EOF_FLAGS_UNION | XFS_EOF_FLAGS_SYNC;
+ eofb.eof_flags = XFS_EOF_FLAGS_UNION | eof_flags;
if (XFS_IS_UQUOTA_ENFORCED(ip->i_mount)) {
dq = xfs_inode_dquot(ip, XFS_DQTYPE_USER);
if (dq && xfs_dquot_lowsp(dq)) {
eofb.eof_uid = VFS_I(ip)->i_uid;
eofb.eof_flags |= XFS_EOF_FLAGS_UID;
- do_work = true;
+ *found_work = true;
}
}
@@ -1679,7 +1683,7 @@ xfs_blockgc_free_quota(
if (dq && xfs_dquot_lowsp(dq)) {
eofb.eof_gid = VFS_I(ip)->i_gid;
eofb.eof_flags |= XFS_EOF_FLAGS_GID;
- do_work = true;
+ *found_work = true;
}
}
@@ -1688,14 +1692,19 @@ xfs_blockgc_free_quota(
if (dq && xfs_dquot_lowsp(dq)) {
eofb.eof_prid = ip->i_d.di_projid;
eofb.eof_flags |= XFS_EOF_FLAGS_PRID;
- do_work = true;
+ *found_work = true;
}
}
- if (!do_work)
- return false;
+ if (*found_work) {
+ error = xfs_icache_free_eofblocks(ip->i_mount, &eofb);
+ if (error)
+ return error;
- xfs_icache_free_eofblocks(ip->i_mount, &eofb);
- xfs_icache_free_cowblocks(ip->i_mount, &eofb);
- return true;
+ error = xfs_icache_free_cowblocks(ip->i_mount, &eofb);
+ if (error)
+ return error;
+ }
+
+ return 0;
}
@@ -54,7 +54,8 @@ long xfs_reclaim_inodes_nr(struct xfs_mount *mp, int nr_to_scan);
void xfs_inode_set_reclaim_tag(struct xfs_inode *ip);
-bool xfs_blockgc_free_quota(struct xfs_inode *ip);
+int xfs_blockgc_free_quota(struct xfs_inode *ip, unsigned int eof_flags,
+ bool *found_work);
void xfs_inode_set_eofblocks_tag(struct xfs_inode *ip);
void xfs_inode_clear_eofblocks_tag(struct xfs_inode *ip);