summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Douwsma <donaldd@sgi.com>2007-05-08 13:49:15 +1000
committerTim Shimmin <tes@sgi.com>2007-05-08 13:49:15 +1000
commit424ea91ba61c1cdc2dac68576c97030cbf47d84f (patch)
tree5114d766bbb4728ccbb18d6aec3a95952a3d4b9f
parent646d5bdab38c88f4b9088d4e517986a3f3b0edb9 (diff)
downloadlinux-3.10-424ea91ba61c1cdc2dac68576c97030cbf47d84f.tar.gz
linux-3.10-424ea91ba61c1cdc2dac68576c97030cbf47d84f.tar.bz2
linux-3.10-424ea91ba61c1cdc2dac68576c97030cbf47d84f.zip
[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>
-rw-r--r--fs/xfs/quota/xfs_qm_syscalls.c4
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 44ab68de971..22d853e77cd 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",