---

yaml --- r: 178727 b: refs/heads/master c: 8b513f5 h: refs/heads/master i: 178725: 828251c 178723: 435e45a 178719: 87b180c v: v3
git-mirror · Jan 2, 2010 · 789e52f · 789e52f
1 parent 5a8902f
commit 789e52f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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);