---

yaml --- r: 309968 b: refs/heads/master c: 9660755 h: refs/heads/master v: v3
git-mirror · Jun 1, 2012 · 7b98b6c · 7b98b6c
1 parent f12b29a
commit 7b98b6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;