[3.0-stable PATCH 12/36] xfs: dont fill statvfs with project quota for a directory

Mark Tinguely
2012-12-03T23:40:41Z

[-- Attachment #1: 066 --]
[-- Type: text/plain, Size: 1087 bytes --]

From: Jie Liu <jeff.liu@oracle.com>

Upstream commit: da5bf95e3cdca348327c82568c2860229c0daaa2
if it was not enabled.

Check if the project quota is running or not before performing
xfs_qm_statvfs(), just return if not. Otherwise the ASSERT
XFS_IS_QUOTA_RUNNING in xfs_qm_dqget will be popped.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
---
fs/xfs/linux-2.6/xfs_super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1091,7 +1091,7 @@ xfs_fs_statfs(

spin_unlock(&mp->m_sb_lock);

- if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) ||
+ if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
((mp->m_qflags & (XFS_PQUOTA_ACCT|XFS_OQUOTA_ENFD))) ==
(XFS_PQUOTA_ACCT|XFS_OQUOTA_ENFD))
xfs_qm_statvfs(ip, statp);