Support quota ID filtering in the eofblocks scan. The caller must
set the XFS_EOF_FLAGS_QUOTA flags bit, quota ID and quota type. The
associated quota type must be enabled on the mounted filesystem.
Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
---
fs/xfs/xfs_fs.h | 3 +++
fs/xfs/xfs_icache.c | 24 ++++++++++++++++++++++++
fs/xfs/xfs_ioctl.c | 8 ++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
index 5f48b3e..6ef9111 100644
--- a/fs/xfs/xfs_fs.h
+++ b/fs/xfs/xfs_fs.h
@@ -345,11 +345,14 @@ typedef struct xfs_error_injection {
struct xfs_eofblocks {
__u32 eof_version;
__u32 eof_flags;
+ __u32 eof_q_id;
+ __u32 eof_q_type;
unsigned char pad[12];
};
/* eof_flags values */
#define XFS_EOF_FLAGS_SYNC 0x01 /* sync/wait mode scan */
+#define XFS_EOF_FLAGS_QUOTA 0x02 /* filter by quota id */
/*
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 35efdda..b39970b 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1171,6 +1171,22 @@ xfs_reclaim_inodes_count(
}
STATIC int
+xfs_inode_match_quota_id(
+ struct xfs_inode *ip,
+ struct xfs_eofblocks *eofb)
+{
+ unsigned int type = xfs_quota_type(eofb->eof_q_type);
+ if (type == XFS_DQ_USER)
+ return ip->i_d.di_uid == eofb->eof_q_id;
+ else if (type == XFS_DQ_GROUP)
+ return ip->i_d.di_gid == eofb->eof_q_id;
+ else if (type == XFS_DQ_PROJ)
+ return xfs_get_projid(ip) == eofb->eof_q_id;
+
+ return 0;
+}
+
+STATIC int
xfs_inode_free_eofblocks(
struct xfs_inode *ip,
struct xfs_perag *pag,
@@ -1178,6 +1194,7 @@ xfs_inode_free_eofblocks(
void *args)
{
int ret;
+ struct xfs_eofblocks *eofb = args;
if (!xfs_can_free_eofblocks(ip, false)) {
/* inode could be preallocated or append-only */
@@ -1194,6 +1211,13 @@ xfs_inode_free_eofblocks(
mapping_tagged(VFS_I(ip)->i_mapping, PAGECACHE_TAG_DIRTY))
return 0;
+ if (eofb) {
+ /* filter by quota id */
+ if (eofb->eof_flags & XFS_EOF_FLAGS_QUOTA &&
+ !xfs_inode_match_quota_id(ip, eofb))
+ return 0;
+ }
+
ret = xfs_free_eofblocks(ip->i_mount, ip, true);
/* don't revisit the inode if we're not waiting */
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index ad4352f..547363b 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1613,6 +1613,14 @@ xfs_file_ioctl(
if (eofb.eof_version != XFS_EOFBLOCKS_VERSION)
return -XFS_ERROR(EINVAL);
+ if (eofb.eof_flags & XFS_EOF_FLAGS_QUOTA) {
+ unsigned int type = xfs_quota_type(eofb.eof_q_type);
+ if ((type == XFS_DQ_USER && !XFS_IS_UQUOTA_ON(mp)) ||
+ (type == XFS_DQ_GROUP && !XFS_IS_GQUOTA_ON(mp)) ||
+ (type == XFS_DQ_PROJ && !XFS_IS_PQUOTA_ON(mp)))
+ return -XFS_ERROR(EINVAL);
+ }
+
flags = (eofb.eof_flags & XFS_EOF_FLAGS_SYNC) ? SYNC_WAIT : SYNC_TRYLOCK;
error = xfs_icache_free_eofblocks(mp, flags, &eofb);
return -error;
--
1.7.7.6
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
