drbd: The kernel code is now equivalent to out of tree release 8.3.7

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

diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index ce3663f..89f4d3a 100644 (file)
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -51,15 +51,11 @@ struct reiserfs_inode_info {
        /* we use these for fsync or O_SYNC to decide which transaction
         ** needs to be committed in order for this inode to be properly
         ** flushed */
-       unsigned long i_trans_id;
+       unsigned int i_trans_id;
        struct reiserfs_journal_list *i_jl;
        struct mutex i_mmap;
-#ifdef CONFIG_REISERFS_FS_POSIX_ACL
-       struct posix_acl *i_acl_access;
-       struct posix_acl *i_acl_default;
-#endif
 #ifdef CONFIG_REISERFS_FS_XATTR
-       struct rw_semaphore xattr_sem;
+       struct rw_semaphore i_xattr_sem;
 #endif
        struct inode vfs_inode;
 };