From 7b98b6cd81d88f7f06f68798cad8210221f39648 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Thu, 31 May 2012 22:54:16 -0400
Subject: [PATCH] --- yaml --- r: 309968 b: refs/heads/master c:
 9660755100ae7677d65772a28e16d475a2ee9eab h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f2ad10527dc..0a1401a50e57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3fc0210c0fc91900766c995f089c39170e68305
+refs/heads/master: 9660755100ae7677d65772a28e16d475a2ee9eab
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 7bccdf32a32c..fc083e87c231 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4301,7 +4301,8 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
 	 * will return the blocks that include the delayed allocation
 	 * blocks for this file.
 	 */
-	delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;
+	delalloc_blocks = EXT4_C2B(EXT4_SB(inode->i_sb),
+				EXT4_I(inode)->i_reserved_data_blocks);
 
 	stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
 	return 0;