Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / include / linux / ext3_fs_i.h

diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index e1c7509c0c9ffdc3af4b6d19a28f067f29337464..4395e5206746b33be79bd57bef264da8a74bcd0a 100644 (file)
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -30,12 +30,12 @@ typedef unsigned long ext3_fsblk_t;
 #define E3FSBLK "%lu"
 
 struct ext3_reserve_window {
-       __u32                   _rsv_start;     /* First byte reserved */
-       __u32                   _rsv_end;       /* Last byte reserved or 0 */
+       ext3_fsblk_t    _rsv_start;     /* First byte reserved */
+       ext3_fsblk_t    _rsv_end;       /* Last byte reserved or 0 */
 };
 
 struct ext3_reserve_window_node {
-       struct rb_node          rsv_node;
+       struct rb_node          rsv_node;
        __u32                   rsv_goal_size;
        __u32                   rsv_alloc_hit;
        struct ext3_reserve_window      rsv_window;
@@ -58,7 +58,7 @@ struct ext3_block_alloc_info {
         * allocated to this file.  This give us the goal (target) for the next
         * allocation when we detect linearly ascending requests.
         */
-       __u32                   last_alloc_physical_block;
+       ext3_fsblk_t            last_alloc_physical_block;
 };
 
 #define rsv_start rsv_window._rsv_start
@@ -75,7 +75,7 @@ struct ext3_inode_info {
        __u8    i_frag_no;
        __u8    i_frag_size;
 #endif
-       __u32   i_file_acl;
+       ext3_fsblk_t    i_file_acl;
        __u32   i_dir_acl;
        __u32   i_dtime;