Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4df46240 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate reiserfs 



reiserfs seems to have another locking level layer for the i_mutex due to the
xattrs-are-a-directory thing.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 36e8e578

fs/reiserfs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ int xattr_readdir(struct file *file, filldir_t filler, void *buf) 
	int res = -ENOTDIR;

	if (!file->f_op || !file->f_op->readdir)

		goto out;

	mutex_lock(&inode->i_mutex);

	mutex_lock_nested(&inode->i_mutex, I_MUTEX_XATTR);

//        down(&inode->i_zombie);

	res = -ENOENT;

	if (!IS_DEADDIR(inode)) {

include/linux/fs.h

+2 −1
Original line number Diff line number Diff line
@@ -570,13 +570,14 @@ struct inode { 
 * 3: quota file

 *

 * The locking order between these classes is

 * parent -> child -> normal -> quota

 * parent -> child -> normal -> xattr -> quota

 */

enum inode_i_mutex_lock_class

{

	I_MUTEX_NORMAL,

	I_MUTEX_PARENT,

	I_MUTEX_CHILD,

	I_MUTEX_XATTR,

	I_MUTEX_QUOTA

};