From b6f5dafdd4bb0467489cd4fbfbb376d9dc49ad0a Mon Sep 17 00:00:00 2001
From: Jie Liu <jeff.liu@oracle.com>
Date: Thu, 12 Apr 2012 03:59:57 +0000
Subject: [PATCH] --- yaml --- r: 307701 b: refs/heads/master c:
 da5bf95e3cdca348327c82568c2860229c0daaa2 h: refs/heads/master i:   307699:
 c517374961858ecd82d79b2cbd06438572c455c6 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/xfs/xfs_super.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4d730810b43..592a220f207f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18caa67ad41212e6f82a675c40f461ffb45f098e
+refs/heads/master: da5bf95e3cdca348327c82568c2860229c0daaa2
diff --git a/trunk/fs/xfs/xfs_super.c b/trunk/fs/xfs/xfs_super.c
index dab9a5f6dfd6..93f7a3f750d3 100644
--- a/trunk/fs/xfs/xfs_super.c
+++ b/trunk/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);