From 74fa61b3c1dff4c67f354fca7b05204e40c00a0d Mon Sep 17 00:00:00 2001 From: Donald Douwsma Date: Tue, 8 May 2007 13:49:15 +1000 Subject: [PATCH] --- yaml --- r: 55139 b: refs/heads/master c: 424ea91ba61c1cdc2dac68576c97030cbf47d84f h: refs/heads/master i: 55137: cc9832baf42e4ec96d60f1d24eae419a7bc96521 55135: af48bde87b23063277fec3426b48f177bbf68252 v: v3 --- [refs] | 2 +- trunk/fs/xfs/quota/xfs_qm_syscalls.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cb7e7bc7d850..ce13d6c417f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 646d5bdab38c88f4b9088d4e517986a3f3b0edb9 +refs/heads/master: 424ea91ba61c1cdc2dac68576c97030cbf47d84f diff --git a/trunk/fs/xfs/quota/xfs_qm_syscalls.c b/trunk/fs/xfs/quota/xfs_qm_syscalls.c index 44ab68de971d..22d853e77cda 100644 --- a/trunk/fs/xfs/quota/xfs_qm_syscalls.c +++ b/trunk/fs/xfs/quota/xfs_qm_syscalls.c @@ -456,9 +456,7 @@ xfs_qm_scall_quotaon( || ((flags & XFS_PQUOTA_ACCT) == 0 && (mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 && - (flags & XFS_OQUOTA_ENFD)) - || - ((flags & XFS_GQUOTA_ACCT) == 0 && + (flags & XFS_GQUOTA_ACCT) == 0 && (mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 && (flags & XFS_OQUOTA_ENFD))) { qdprintk("Can't enforce without acct, flags=%x sbflags=%x\n",