upgrade to linux 2.6.10-1.12_FC2

[linux-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 c549633..328cd40 100644 (file)
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -20,17 +20,17 @@
 #include <linux/rbtree.h>
 #include <linux/seqlock.h>
 
-struct reserve_window {
+struct ext3_reserve_window {
        __u32                   _rsv_start;     /* First byte reserved */
        __u32                   _rsv_end;       /* Last byte reserved or 0 */
 };
 
-struct reserve_window_node {
+struct ext3_reserve_window_node {
        struct rb_node          rsv_node;
        atomic_t                rsv_goal_size;
        atomic_t                rsv_alloc_hit;
        seqlock_t               rsv_seqlock;
-       struct reserve_window   rsv_window;
+       struct ext3_reserve_window      rsv_window;
 };
 
 #define rsv_start rsv_window._rsv_start
@@ -76,7 +76,7 @@ struct ext3_inode_info {
         */
        __u32   i_next_alloc_goal;
        /* block reservation window */
-       struct reserve_window_node i_rsv_window;
+       struct ext3_reserve_window_node i_rsv_window;
 
        __u32   i_dir_start_lookup;
 #ifdef CONFIG_EXT3_FS_XATTR