From 368a3a1aaac05920dbd6cfcd6ca597828808f945 Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Wed, 5 Jan 2011 10:07:15 +0000
Subject: [PATCH] --- yaml --- r: 231754 b: refs/heads/master c:
 299a08b1c34f9397797946a0fa215c5fd145c5cf h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/super.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4525bc22e3b4..3d6ff370fa5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f580eb0931fbcb6dc3916f094f471671facd1daa
+refs/heads/master: 299a08b1c34f9397797946a0fa215c5fd145c5cf
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index a1a76b2a61f9..caa5bcc62f16 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -790,11 +790,10 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(found, head, list) {
-		if (found->flags & (BTRFS_BLOCK_GROUP_METADATA |
-				    BTRFS_BLOCK_GROUP_SYSTEM))
-			total_used_data += found->disk_total;
-		else
+		if (found->flags & BTRFS_BLOCK_GROUP_DATA)
 			total_used_data += found->disk_used;
+		else
+			total_used_data += found->disk_total;
 		total_used += found->disk_used;
 	}
 	rcu_read_unlock();