From b29f0befa75e5ec179b427605f155d7e7760dc81 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 16 Dec 2009 23:25:50 +0100
Subject: [PATCH] --- yaml --- r: 178718 b: refs/heads/master c:
 47376ceba54600cec4dd9e7c4fe8b98e4269633a h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/fs/reiserfs/xattr.c         | 3 ++-
 trunk/include/linux/reiserfs_fs.h | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index abaa8b18dcab..c38a832ce260 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb1c2e51c5a72f093b5af384b11d2f1c2abd6c13
+refs/heads/master: 47376ceba54600cec4dd9e7c4fe8b98e4269633a
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index 58aa8e75f7f5..8891cd88a3f4 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -243,7 +243,8 @@ static int reiserfs_for_each_xattr(struct inode *inode,
 		goto out_dir;
 	}
 
-	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR);
+	reiserfs_mutex_lock_nested_safe(&dir->d_inode->i_mutex, I_MUTEX_XATTR,
+					inode->i_sb);
 	buf.xadir = dir;
 	err = reiserfs_readdir_dentry(dir, &buf, fill_with_dentries, &pos);
 	while ((err == 0 || err == -ENOSPC) && buf.count) {
diff --git a/trunk/include/linux/reiserfs_fs.h b/trunk/include/linux/reiserfs_fs.h
index a05b4a20768d..4351b49e2b1e 100644
--- a/trunk/include/linux/reiserfs_fs.h
+++ b/trunk/include/linux/reiserfs_fs.h
@@ -97,6 +97,15 @@ static inline void reiserfs_mutex_lock_safe(struct mutex *m,
 	reiserfs_write_lock(s);
 }
 
+static inline void
+reiserfs_mutex_lock_nested_safe(struct mutex *m, unsigned int subclass,
+			       struct super_block *s)
+{
+	reiserfs_write_unlock(s);
+	mutex_lock_nested(m, subclass);
+	reiserfs_write_lock(s);
+}
+
 /*
  * When we schedule, we usually want to also release the write lock,
  * according to the previous bkl based locking scheme of reiserfs.