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

Commit e6d29426 authored by Kouta Ooizumi's avatar Kouta Ooizumi Committed by Tim Shimmin
Browse files

[XFS] Fix uquota and oquota enforcement problems. 



When uquota and oquota (gquota/pquota) are enabled for accounting both are
enforced if ether has enforcement active.

Conditions:

- Both XFS_UQUOTA_ACCT and XFS_GQUOTA_ACCT are enabled.

- Either XFS_UQUOTA_ENFD or XFS_OQUOTA_ENFD is enabled.

- The usage without enforce is reached at the soft limit.

Problems:

1. "repquota" shows all grace time even if no enforcement.

2. we cannot make a file over a hard limits even if no enforcement.

SGI-PV: 962291
SGI-Modid: xfs-linux-melb:xfs-kern:28272a

Signed-off-by: default avatarKouta Ooizumi <k-ooizumi@tnes.nec.co.jp>
Signed-off-by: default avatarDonald Douwsma <donaldd@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent d3cf2094

fs/xfs/quota/xfs_qm_syscalls.c

+7 −2
Original line number Diff line number Diff line
@@ -909,14 +909,19 @@ xfs_qm_export_dquot( 
	 * gets turned off. No need to confuse the user level code,

	 * so return zeroes in that case.

	 */

	if (! XFS_IS_QUOTA_ENFORCED(mp)) {

	if ((!XFS_IS_UQUOTA_ENFORCED(mp) && src->d_flags == XFS_DQ_USER) ||

	    (!XFS_IS_OQUOTA_ENFORCED(mp) &&

			(src->d_flags & (XFS_DQ_PROJ | XFS_DQ_GROUP)))) {

		dst->d_btimer = 0;

		dst->d_itimer = 0;

		dst->d_rtbtimer = 0;

	}



#ifdef DEBUG

	if (XFS_IS_QUOTA_ENFORCED(mp) && dst->d_id != 0) {

	if (((XFS_IS_UQUOTA_ENFORCED(mp) && dst->d_flags == XFS_USER_QUOTA) ||

	     (XFS_IS_OQUOTA_ENFORCED(mp) &&

			(dst->d_flags & (XFS_PROJ_QUOTA | XFS_GROUP_QUOTA)))) &&

	    dst->d_id != 0) {

		if (((int) dst->d_bcount >= (int) dst->d_blk_softlimit) &&

		    (dst->d_blk_softlimit > 0)) {

			ASSERT(dst->d_btimer != 0);

fs/xfs/quota/xfs_trans_dquot.c

+3 −1
Original line number Diff line number Diff line
@@ -656,7 +656,9 @@ xfs_trans_dqresv( 


	if ((flags & XFS_QMOPT_FORCE_RES) == 0 &&

	    dqp->q_core.d_id &&

	    XFS_IS_QUOTA_ENFORCED(dqp->q_mount)) {

	    ((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) ||

	     (XFS_IS_OQUOTA_ENFORCED(dqp->q_mount) &&

	      (XFS_QM_ISPDQ(dqp) || XFS_QM_ISGDQ(dqp))))) {

#ifdef QUOTADEBUG

		cmn_err(CE_DEBUG, "BLK Res: nblks=%ld + resbcount=%Ld"

			  " > hardlimit=%Ld?", nblks, *resbcountp, hardlimit);

fs/xfs/xfs_quota.h

+2 −1
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ typedef struct xfs_qoff_logformat { 
#define XFS_ALL_QUOTA_CHKD	(XFS_UQUOTA_CHKD | XFS_OQUOTA_CHKD)



#define XFS_IS_QUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_ALL_QUOTA_ACCT)

#define XFS_IS_QUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_ALL_QUOTA_ENFD)

#define XFS_IS_UQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_UQUOTA_ACCT)

#define XFS_IS_PQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_PQUOTA_ACCT)

#define XFS_IS_GQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_GQUOTA_ACCT)

#define XFS_IS_UQUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_UQUOTA_ENFD)

#define XFS_IS_OQUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_OQUOTA_ENFD)



/*

 * Incore only flags for quotaoff - these bits get cleared when quota(s)