From b7b4ea944f0e1a85771cae185acbbe9c1ea11477 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Mon, 30 Mar 2009 16:49:58 -0400
Subject: [PATCH] --- yaml --- r: 138997 b: refs/heads/master c:
 3a355cc61d41bc31cc23a57247df63dba80a6018 h: refs/heads/master i:   138995:
 99d35c6390b454ba46276241c2f0b579ba87a23b v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/xattr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3208cc43eb28..c4d9a455420e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e465867080c2d1e0c410e96dcdcd51e8584a6f
+refs/heads/master: 3a355cc61d41bc31cc23a57247df63dba80a6018
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index e52743e77000..f83f52bae390 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -57,12 +57,14 @@
 /* Helpers for inode ops. We do this so that we don't have all the VFS
  * overhead and also for proper i_mutex annotation.
  * dir->i_mutex must be held for all of them. */
+#ifdef CONFIG_REISERFS_FS_XATTR
 static int xattr_create(struct inode *dir, struct dentry *dentry, int mode)
 {
 	BUG_ON(!mutex_is_locked(&dir->i_mutex));
 	vfs_dq_init(dir);
 	return dir->i_op->create(dir, dentry, mode, NULL);
 }
+#endif
 
 static int xattr_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {