* [PATCH 2/2] Fix a bug which is in user or group quota enforcement disabled
@ 2007-02-23 4:23 Kouta Ooizumi
2007-03-20 1:09 ` Donald Douwsma
0 siblings, 1 reply; 2+ messages in thread
From: Kouta Ooizumi @ 2007-02-23 4:23 UTC (permalink / raw)
To: xfs
Hi!
I found a bug in the following conditions.
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.
Factor:
- Following if-statements are considered "disabled all enforcement" only.
1. xfs_qm_export_dquot() in fs/xfs/quota/xfs_qm_syscalls.c
if (! XFS_IS_QUOTA_ENFORCED(mp)) { **
dst->d_btimer = 0;
dst->d_itimer = 0;
dst->d_rtbtimer = 0;
}
2. xfs_trans_dqresv() in fs/xfs/quota/xfs_trans_dquot.c
if ((flags & XFS_QMOPT_FORCE_RES) == 0 &&
dqp->q_core.d_id &&
XFS_IS_QUOTA_ENFORCED(dqp->q_mount)) { **
Example:
# mount -t xfs -o usrquota,grpquota /dev/sda6 /mnt/xfs
# repquota -ug /mnt
*** Report for user quotas on device /dev/sda6
Block grace time: 7days; Inode grace time: 7days
Block limits File limits
User used soft hard grace used soft hard grace
----------------------------------------------------------------------
root -- 0 0 0 2 0 0
k-ooizumi +- 1024 1000 2000 3days 2 0 0
xfstest -- 2048 0 0 2 0 0
*** Report for group quotas on device /dev/sda6
Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Group used soft hard grace used soft hard grace
----------------------------------------------------------------------
root -- 0 0 0 2 0 0
users +- 3072 3000 4000 6days 4 0 0
# quotaoff -g(or -u) -x enforce /mnt/xfs
# repquota -vug /mnt/xfs
*** Report for user quotas on device /dev/sda6
Block grace time: 7days; Inode grace time: 7days
Block limits File limits
User used soft hard grace used soft hard grace
----------------------------------------------------------------------
root -- 0 0 0 2 0 0
k-ooizumi +- 1024 1000 2000 3days 2 0 0
xfstest -- 2048 0 0 2 0 0
*** Status for user quotas on device /dev/sda6
Accounting: ON; Enforcement: ON
Inode: #131 (2 blocks, 2 extents)
*** Report for group quotas on device /dev/sda6
Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Group used soft hard grace used soft hard grace
----------------------------------------------------------------------
root -- 0 0 0 2 0 0
users +- 3072 3000 4000 6days 4 0 0
*** Status for group quotas on device /dev/sda6
Accounting: ON; Enforcement: OFF
Inode: #132 (2 blocks, 2 extents)
xfstest@*** > /usr/sbin/xfs_mkfile 1m /mnt/xfs/file_1
/mnt/xfs/file_1: Disk quota exceeded
Here is the patch.
Signed-off-by: Kouta Ooizumi <k-ooizumi@tnes.nec.co.jp>
diff -uprN linux-2.6.20-orig/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.20/fs/xfs/quota/xfs_qm_syscalls.c
--- linux-2.6.20-orig/fs/xfs/quota/xfs_qm_syscalls.c 2007-02-22 20:14:16.000000000 +0900
+++ linux-2.6.20/fs/xfs/quota/xfs_qm_syscalls.c 2007-02-23 11:06:26.000000000 +0900
@@ -911,14 +911,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);
diff -uprN linux-2.6.20-orig/fs/xfs/quota/xfs_trans_dquot.c linux-2.6.20/fs/xfs/quota/xfs_trans_dquot.c
--- linux-2.6.20-orig/fs/xfs/quota/xfs_trans_dquot.c 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.20/fs/xfs/quota/xfs_trans_dquot.c 2007-02-23 11:06:23.000000000 +0900
@@ -658,7 +658,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);
diff -uprN linux-2.6.20-orig/fs/xfs/xfs_quota.h linux-2.6.20/fs/xfs/xfs_quota.h
--- linux-2.6.20-orig/fs/xfs/xfs_quota.h 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.20/fs/xfs/xfs_quota.h 2007-02-23 11:06:19.000000000 +0900
@@ -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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] Fix a bug which is in user or group quota enforcement disabled
2007-02-23 4:23 [PATCH 2/2] Fix a bug which is in user or group quota enforcement disabled Kouta Ooizumi
@ 2007-03-20 1:09 ` Donald Douwsma
0 siblings, 0 replies; 2+ messages in thread
From: Donald Douwsma @ 2007-03-20 1:09 UTC (permalink / raw)
To: Kouta Ooizumi; +Cc: xfs
Kouta Ooizumi wrote:
> Hi!
>
> I found a bug in the following conditions.
>
> 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.
Hi Kouta,
Thanks for the patches, they're both in now.
Sorry for the delay picking them up.
Donald
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-20 1:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-23 4:23 [PATCH 2/2] Fix a bug which is in user or group quota enforcement disabled Kouta Ooizumi
2007-03-20 1:09 ` Donald Douwsma
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox