diff options
| author | Jie Liu <jeff.liu@oracle.com> | 2012-04-12 03:59:57 +0000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-04-16 16:32:20 -0500 |
| commit | da5bf95e3cdca348327c82568c2860229c0daaa2 (patch) | |
| tree | 2489e495921c4bcdd16246feeeeaef5ade6924c5 /fs | |
| parent | 18caa67ad41212e6f82a675c40f461ffb45f098e (diff) | |
| download | op-kernel-dev-da5bf95e3cdca348327c82568c2860229c0daaa2.zip op-kernel-dev-da5bf95e3cdca348327c82568c2860229c0daaa2.tar.gz | |
xfs: don't fill statvfs with project quota for a directory 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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index dab9a5f..93f7a3f 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1072,7 +1072,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); |
