3 files changed, 12 insertions, 2 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 8810fda0da46..78f23f406932 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1129,7 +1129,7 @@ static void init_inode(struct inode *inode, struct path *path)
         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_xattr_rwsem(inode);
 
         if (stat_data_v1(ih)) {
                 struct stat_data_v1 *sd =
@@ -1836,7 +1836,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
         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_xattr_rwsem(inode);
 
         if (old_format_only(sb))
                 make_le_item_head(&ih, NULL, KEY_FORMAT_3_5, SD_OFFSET,
diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index 149be8d9a0c9..711e7e7cafa5 100644
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -55,7 +55,9 @@ struct reiserfs_inode_info {
 
         struct posix_acl *i_acl_access;
         struct posix_acl *i_acl_default;
+#ifdef CONFIG_REISERFS_FS_XATTR
         struct rw_semaphore xattr_sem;
+#endif
         struct inode vfs_inode;
 };
 
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 5e961035c725..966c35851b2e 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -97,6 +97,11 @@ static inline void reiserfs_mark_inode_private(struct inode *inode)
         inode->i_flags |= S_PRIVATE;
 }
 
+static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
+{
+        init_rwsem(&REISERFS_I(inode)->xattr_sem);
+}
+
 #else
 
 #define is_reiserfs_priv_object(inode) 0
@@ -129,6 +134,9 @@ static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)
         sb->s_flags = (sb->s_flags & ~MS_POSIXACL);     /* to be sure */
         return 0;
 };
+static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
+{
+}
 #endif
 
 #endif                          /* __KERNEL__ */