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

Commit 81cbf6d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'lockdep-for-linus' of... 

Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: Fix lockdep annotation for pipe_double_lock()
parents 3c330108 023d43c7

fs/pipe.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -68,8 +68,8 @@ void pipe_double_lock(struct pipe_inode_info *pipe1, 
		pipe_lock_nested(pipe1, I_MUTEX_PARENT);

		pipe_lock_nested(pipe1, I_MUTEX_PARENT);

		pipe_lock_nested(pipe2, I_MUTEX_CHILD);

		pipe_lock_nested(pipe2, I_MUTEX_CHILD);

	} else {

	} else {

		pipe_lock_nested(pipe2, I_MUTEX_CHILD);

		pipe_lock_nested(pipe2, I_MUTEX_PARENT);

		pipe_lock_nested(pipe1, I_MUTEX_PARENT);

		pipe_lock_nested(pipe1, I_MUTEX_CHILD);

	}

	}

}

}