]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
xfs: don't fill statvfs with project quota for a directory if it was not enabled.
authorJie Liu <jeff.liu@oracle.com>
Thu, 12 Apr 2012 03:59:57 +0000 (03:59 +0000)
committerBen Myers <bpm@sgi.com>
Mon, 16 Apr 2012 21:32:20 +0000 (16:32 -0500)
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/xfs_super.c

index dab9a5f6dfd68345646849f6ca391fa3849839bb..93f7a3f750d317db064b5b622225c591def4f360 100644 (file)
@@ -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);