nfsd4: reshuffle lease-setting code to allow reuse

[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 201dd91..89f4d3a 100644 (file)
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -54,12 +54,8 @@ struct reiserfs_inode_info {
        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;
 };