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 2bed0effdcaeeb5010b432ab73a0de731092a45a..bb42379cb7fdf91dde212e257df8d63ed06426f2 100644 (file)
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -25,13 +25,7 @@
 typedef int ext4_grpblk_t;
 
 /* data type for filesystem-wide blocks number */
-typedef sector_t ext4_fsblk_t;
-
-#if BITS_PER_LONG == 64
-#define E3FSBLK "%lu"
-#else
-#define E3FSBLK "%llu"
-#endif
+typedef unsigned long long ext4_fsblk_t;
 
 struct ext4_reserve_window {
        ext4_fsblk_t    _rsv_start;     /* First byte reserved */