From a90648479cdea0e1bd04384001cafa1f2c3fa42f Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Wed, 30 Dec 2009 07:40:39 +0100 Subject: [PATCH] --- yaml --- r: 178728 b: refs/heads/master c: 835d5247d98f46e35d007dcfa6215e526ca33360 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 b65e65bbc8e5..93696cb842aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b513f56d4e117f11cf0760abcc030eedefc45c3 +refs/heads/master: 835d5247d98f46e35d007dcfa6215e526ca33360 diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c index bfdac66fd8e2..9623cfe2371c 100644 --- a/trunk/fs/reiserfs/xattr.c +++ b/trunk/fs/reiserfs/xattr.c @@ -98,7 +98,8 @@ static int xattr_rmdir(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); dentry_unhash(dentry); error = dir->i_op->rmdir(dir, dentry); if (!error)