Commit d19e9974 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Simplify fifo_open() locking logic 



We don't do interruptible waits for the pipe mutex anywhere else any
more either, so don't do it in fifo_open() either.

Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d11d9b2d

fs/fifo.c

+1 −6
Original line number Diff line number Diff line
@@ -34,10 +34,7 @@ static int fifo_open(struct inode *inode, struct file *filp) 
{

	int ret;



	ret = -ERESTARTSYS;

	if (mutex_lock_interruptible(PIPE_MUTEX(*inode)))

		goto err_nolock_nocleanup;



	mutex_lock(PIPE_MUTEX(*inode));

	if (!inode->i_pipe) {

		ret = -ENOMEM;

		if(!pipe_new(inode))
@@ -140,8 +137,6 @@ static int fifo_open(struct inode *inode, struct file *filp) 


err_nocleanup:

	mutex_unlock(PIPE_MUTEX(*inode));



err_nolock_nocleanup:

	return ret;

}