Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[~andy/linux] / include / linux / ext4_fs_i.h

diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index 40ce04a52b04c1da43cbf541f6f671ed066a2739..bb42379cb7fdf91dde212e257df8d63ed06426f2 100644 (file)
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -25,9 +25,7 @@
 typedef int ext4_grpblk_t;
 
 /* data type for filesystem-wide blocks number */
-typedef unsigned long ext4_fsblk_t;
-
-#define E3FSBLK "%lu"
+typedef unsigned long long ext4_fsblk_t;
 
 struct ext4_reserve_window {
        ext4_fsblk_t    _rsv_start;     /* First byte reserved */
@@ -68,10 +66,10 @@ struct ext4_block_alloc_info {
  * storage for cached extent
  */
 struct ext4_ext_cache {
-       __u32   ec_start;
-       __u32   ec_block;
-       __u32   ec_len; /* must be 32bit to return holes */
-       __u32   ec_type;
+       ext4_fsblk_t    ec_start;
+       __u32           ec_block;
+       __u32           ec_len; /* must be 32bit to return holes */
+       __u32           ec_type;
 };
 
 /*