Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6743099c authored by Arkadiusz Mi?kiewicz's avatar Arkadiusz Mi?kiewicz Committed by Alex Elder
Browse files

xfs: Extend project quotas to support 32bit project ids 



This patch adds support for 32bit project quota identifiers.

On disk format is backward compatible with 16bit projid numbers. projid
on disk is now kept in two 16bit values - di_projid_lo (which holds the
same position as old 16bit projid value) and new di_projid_hi (takes
existing padding) and converts from/to 32bit value on the fly.

xfs_admin (for existing fs), mkfs.xfs (for new fs) needs to be used
to enable PROJID32BIT support.

Signed-off-by: default avatarArkadiusz Miśkiewicz <arekm@maven.pl>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 1a1a3e97

fs/xfs/linux-2.6/xfs_ioctl.c

+7 −7
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ xfs_ioc_fsgetxattr( 
	xfs_ilock(ip, XFS_ILOCK_SHARED);

	fa.fsx_xflags = xfs_ip2xflags(ip);

	fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;

	fa.fsx_projid = ip->i_d.di_projid;

	fa.fsx_projid = xfs_get_projid(ip);



	if (attr) {

		if (ip->i_afp) {
@@ -909,10 +909,10 @@ xfs_ioctl_setattr( 
		return XFS_ERROR(EIO);



	/*

	 * Disallow 32bit project ids because on-disk structure

	 * is 16bit only.

	 * Disallow 32bit project ids when projid32bit feature is not enabled.

	 */

	if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1))

	if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1) &&

			!xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))

		return XFS_ERROR(EINVAL);



	/*
@@ -961,7 +961,7 @@ xfs_ioctl_setattr( 
	if (mask & FSX_PROJID) {

		if (XFS_IS_QUOTA_RUNNING(mp) &&

		    XFS_IS_PQUOTA_ON(mp) &&

		    ip->i_d.di_projid != fa->fsx_projid) {

		    xfs_get_projid(ip) != fa->fsx_projid) {

			ASSERT(tp);

			code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,

						capable(CAP_FOWNER) ?
@@ -1063,12 +1063,12 @@ xfs_ioctl_setattr( 
		 * Change the ownerships and register quota modifications

		 * in the transaction.

		 */

		if (ip->i_d.di_projid != fa->fsx_projid) {

		if (xfs_get_projid(ip) != fa->fsx_projid) {

			if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {

				olddquot = xfs_qm_vop_chown(tp, ip,

							&ip->i_gdquot, gdqp);

			}

			ip->i_d.di_projid = fa->fsx_projid;

			xfs_set_projid(ip, fa->fsx_projid);



			/*

			 * We may have to rev the inode as well as

fs/xfs/linux-2.6/xfs_ioctl32.c

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ xfs_ioctl32_bstat_copyin( 
	    get_user(bstat->bs_extsize,	&bstat32->bs_extsize)	||

	    get_user(bstat->bs_extents,	&bstat32->bs_extents)	||

	    get_user(bstat->bs_gen,	&bstat32->bs_gen)	||

	    get_user(bstat->bs_projid,	&bstat32->bs_projid)	||

	    get_user(bstat->bs_projid_lo, &bstat32->bs_projid_lo) ||

	    get_user(bstat->bs_projid_hi, &bstat32->bs_projid_hi) ||

	    get_user(bstat->bs_dmevmask, &bstat32->bs_dmevmask)	||

	    get_user(bstat->bs_dmstate,	&bstat32->bs_dmstate)	||

	    get_user(bstat->bs_aextents, &bstat32->bs_aextents))
@@ -218,6 +219,7 @@ xfs_bulkstat_one_fmt_compat( 
	    put_user(buffer->bs_extents,  &p32->bs_extents)	||

	    put_user(buffer->bs_gen,	  &p32->bs_gen)		||

	    put_user(buffer->bs_projid,	  &p32->bs_projid)	||

	    put_user(buffer->bs_projid_hi,	&p32->bs_projid_hi)	||

	    put_user(buffer->bs_dmevmask, &p32->bs_dmevmask)	||

	    put_user(buffer->bs_dmstate,  &p32->bs_dmstate)	||

	    put_user(buffer->bs_aextents, &p32->bs_aextents))

fs/xfs/linux-2.6/xfs_ioctl32.h

+4 −2
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ typedef struct compat_xfs_bstat { 
	__s32		bs_extsize;	/* extent size			*/

	__s32		bs_extents;	/* number of extents		*/

	__u32		bs_gen;		/* generation count		*/

	__u16		bs_projid;	/* project id			*/

	unsigned char	bs_pad[14];	/* pad space, unused		*/

	__u16		bs_projid_lo;	/* lower part of project id	*/

#define	bs_projid	bs_projid_lo	/* (previously just bs_projid)	*/

	__u16		bs_projid_hi;	/* high part of project id	*/

	unsigned char	bs_pad[12];	/* pad space, unused		*/

	__u32		bs_dmevmask;	/* DMIG event mask		*/

	__u16		bs_dmstate;	/* DMIG state info		*/

	__u16		bs_aextents;	/* attribute number of extents	*/

fs/xfs/linux-2.6/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 
#define SYNCHRONIZE()	barrier()

#define __return_address __builtin_return_address(0)



#define dfltprid	0

#define XFS_PROJID_DEFAULT	0

#define MAXPATHLEN	1024



#define MIN(a,b)	(min(a,b))

fs/xfs/quota/xfs_qm.c

+5 −5
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ xfs_qm_dqattach_locked( 
			xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP,

						flags & XFS_QMOPT_DQALLOC,

						ip->i_udquot, &ip->i_gdquot) :

			xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQ_PROJ,

			xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ,

						flags & XFS_QMOPT_DQALLOC,

						ip->i_udquot, &ip->i_gdquot);

		/*
@@ -1630,7 +1630,7 @@ xfs_qm_dqusage_adjust( 
	}



	if (XFS_IS_PQUOTA_ON(mp)) {

		error = xfs_qm_quotacheck_dqadjust(ip, ip->i_d.di_projid,

		error = xfs_qm_quotacheck_dqadjust(ip, xfs_get_projid(ip),

						   XFS_DQ_PROJ, nblks, rtblks);

		if (error)

			goto error0;
@@ -2249,7 +2249,7 @@ xfs_qm_vop_dqalloc( 
			xfs_dqunlock(gq);

		}

	} else if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {

		if (ip->i_d.di_projid != prid) {

		if (xfs_get_projid(ip) != prid) {

			xfs_iunlock(ip, lockflags);

			if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t)prid,

						 XFS_DQ_PROJ,
@@ -2371,7 +2371,7 @@ xfs_qm_vop_chown_reserve( 
	}

	if (XFS_IS_OQUOTA_ON(ip->i_mount) && gdqp) {

		if (XFS_IS_PQUOTA_ON(ip->i_mount) &&

		     ip->i_d.di_projid != be32_to_cpu(gdqp->q_core.d_id))

		     xfs_get_projid(ip) != be32_to_cpu(gdqp->q_core.d_id))

			prjflags = XFS_QMOPT_ENOSPC;



		if (prjflags ||
@@ -2475,7 +2475,7 @@ xfs_qm_vop_create_dqattach( 
		ip->i_gdquot = gdqp;

		ASSERT(XFS_IS_OQUOTA_ON(mp));

		ASSERT((XFS_IS_GQUOTA_ON(mp) ?

			ip->i_d.di_gid : ip->i_d.di_projid) ==

			ip->i_d.di_gid : xfs_get_projid(ip)) ==

				be32_to_cpu(gdqp->q_core.d_id));

		xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);

	}