From 5a8902f143abbab0a26932774be1bfb95246b525 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 30 Dec 2009 07:26:28 +0100
Subject: [PATCH] --- yaml --- r: 178726 b: refs/heads/master c:
 4dd859697f836cf62c8de08bd9a9f4b4f4beaa91 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 20ea15ed1fe7..38731ee858fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c674905ca74ad0ae5b048afb1ef68663a0d7e987
+refs/heads/master: 4dd859697f836cf62c8de08bd9a9f4b4f4beaa91
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index 78a3f246295c..8b9631d30ffc 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -82,7 +82,8 @@ static int xattr_unlink(struct inode *dir, struct dentry *dentry)
 	BUG_ON(!mutex_is_locked(&dir->i_mutex));
 	vfs_dq_init(dir);
 
-	mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);
+	reiserfs_mutex_lock_nested_safe(&dentry->d_inode->i_mutex,
+					I_MUTEX_CHILD, dir->i_sb);
 	error = dir->i_op->unlink(dir, dentry);
 	mutex_unlock(&dentry->d_inode->i_mutex);