[PATCH v5 08/10] xfs: add quota id filtering to eofblocks scan

[Dave Chinner]

On Fri, Oct 05, 2012 at 10:17:14AM -0400, Brian Foster wrote:
> 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.

I'm wondering if this even needs quota enabled to filter based on a
uid, gid, or prid?

The quota part of it seem irrelevant to the filtering that is being
executed - we are only matching against the inode uid/gid/prid, not
against dquots - and I can see situations where just being able to
filter on a given uid/gid might be useful in a multi-user
environment regardless of whether quotas are being used.

Indeed, even testing is made much easier if we don't have to
juggle quota mount options to test the filtering....

> 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;
> +}

Why do you need xfs_quota_type() here? why not just:

	switch (type) {
	case XQM_USRQUOTA:
		return ip->i_d.di_uid == eofb->eof_q_id;
	case XQM_GRPQUOTA:
		return ip->i_d.di_gid == eofb->eof_q_id;
	case XQM_PRJQUOTA:
		return xfs_get_projid(ip) == eofb->eof_q_id;
	default:
		break;
	}

	return 0;

> @@ -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);
> +		}

Again, I don't really see the reason for needing xfs_quota_type()
here, and whether the quota check is relevant at all...

Cheers,

Dave.
-- 
Dave Chinner
david at fromorbit.com