From 789e52ffd8789ca2079f7fe2ed6348c87ca9850b Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 30 Dec 2009 07:28:58 +0100
Subject: [PATCH] --- yaml --- r: 178727 b: refs/heads/master c:
 8b513f56d4e117f11cf0760abcc030eedefc45c3 h: refs/heads/master i:   178725:
 828251c3433896925c41732a622dab6722a8fe21   178723:
 435e45a70fa3f8e18b1b2a758bce215fd074d7ae   178719:
 87b180c6a09a6fb19adcbe31bde3a297e1095559 v: v3

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

diff --git a/[refs] b/[refs]
index 38731ee858fd..b65e65bbc8e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dd859697f836cf62c8de08bd9a9f4b4f4beaa91
+refs/heads/master: 8b513f56d4e117f11cf0760abcc030eedefc45c3
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index 8b9631d30ffc..bfdac66fd8e2 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -289,8 +289,9 @@ static int reiserfs_for_each_xattr(struct inode *inode,
 		err = journal_begin(&th, inode->i_sb, blocks);
 		if (!err) {
 			int jerror;
-			mutex_lock_nested(&dir->d_parent->d_inode->i_mutex,
-					  I_MUTEX_XATTR);
+			reiserfs_mutex_lock_nested_safe(
+					  &dir->d_parent->d_inode->i_mutex,
+					  I_MUTEX_XATTR, inode->i_sb);
 			err = action(dir, data);
 			jerror = journal_end(&th, inode->i_sb, blocks);
 			mutex_unlock(&dir->d_parent->d_inode->i_mutex);