Merge branch 'master' into gfs2

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 8810fda0da46..7e5a2f5ebeb0 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1127,9 +1127,9 @@ static void init_inode(struct inode *inode, struct path *path)
         REISERFS_I(inode)->i_prealloc_count = 0;
         REISERFS_I(inode)->i_trans_id = 0;
         REISERFS_I(inode)->i_jl = NULL;
-        REISERFS_I(inode)->i_acl_access = NULL;
-        REISERFS_I(inode)->i_acl_default = NULL;
-        init_rwsem(&REISERFS_I(inode)->xattr_sem);
+        reiserfs_init_acl_access(inode);
+        reiserfs_init_acl_default(inode);
+        reiserfs_init_xattr_rwsem(inode);
 
         if (stat_data_v1(ih)) {
                 struct stat_data_v1 *sd =
@@ -1834,9 +1834,9 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
         REISERFS_I(inode)->i_attrs =
             REISERFS_I(dir)->i_attrs & REISERFS_INHERIT_MASK;
         sd_attrs_to_i_attrs(REISERFS_I(inode)->i_attrs, inode);
-        REISERFS_I(inode)->i_acl_access = NULL;
-        REISERFS_I(inode)->i_acl_default = NULL;
-        init_rwsem(&REISERFS_I(inode)->xattr_sem);
+        reiserfs_init_acl_access(inode);
+        reiserfs_init_acl_default(inode);
+        reiserfs_init_xattr_rwsem(inode);
 
         if (old_format_only(sb))
                 make_le_item_head(&ih, NULL, KEY_FORMAT_3_5, SD_OFFSET,
@@ -1974,11 +1974,13 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
          * iput doesn't deadlock in reiserfs_delete_xattrs. The locking
          * code really needs to be reworked, but this will take care of it
          * for now. -jeffm */
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
         if (REISERFS_I(dir)->i_acl_default && !IS_ERR(REISERFS_I(dir)->i_acl_default)) {
                 reiserfs_write_unlock_xattrs(dir->i_sb);
                 iput(inode);
                 reiserfs_write_lock_xattrs(dir->i_sb);
         } else
+#endif
                 iput(inode);
         return err;
 }