[XFS] Fix quotaon syscall failures for group enforcement requests.

xfs_qm_scall_quotaon was incorrectly failing requests to enable group
quota enforcement. Fixes logic error in OQUOTA handling.

SGI-PV: 961964
SGI-Modid: xfs-linux-melb:xfs-kern:28227a

Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index 44ab68de971d..22d853e77cda 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/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",