serial: fix NULL pointer dereference

[safe/jmp/linux-2.6] / include / linux / ext3_fs_i.h

diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index e1c7509..93e7428 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;
@@ -54,11 +54,11 @@ struct ext3_block_alloc_info {
        /*
         * Was i_next_alloc_goal in ext3_inode_info
         * is the *physical* companion to i_next_alloc_block.
-        * it the the physical block number of the block which was most-recentl
+        * it the physical block number of the block which was most-recentl
         * 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;
 
@@ -103,10 +103,6 @@ struct ext3_inode_info {
         */
        struct rw_semaphore xattr_sem;
 #endif
-#ifdef CONFIG_EXT3_FS_POSIX_ACL
-       struct posix_acl        *i_acl;
-       struct posix_acl        *i_default_acl;
-#endif
 
        struct list_head i_orphan;      /* unlinked but open inodes */
 
@@ -141,6 +137,14 @@ struct ext3_inode_info {
         * by other means, so we have truncate_mutex.
         */
        struct mutex truncate_mutex;
+
+       /*
+        * Transactions that contain inode's metadata needed to complete
+        * fsync and fdatasync, respectively.
+        */
+       atomic_t i_sync_tid;
+       atomic_t i_datasync_tid;
+
        struct inode vfs_inode;
 };