aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-07 09:16:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-07 09:16:35 -0800
commitd19e9974084b4024abcfcfc9d8676c90d26994bb (patch)
tree4f97c70129e74730a57cc7988877b2243e1d3a93
parentd11d9b2dd2c43dd99a491df8a83ae28401db0044 (diff)
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: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/fifo.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/fifo.c b/fs/fifo.c
index 923371b753a..d13fcd3ec80 100644
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -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 @@ err:
err_nocleanup:
mutex_unlock(PIPE_MUTEX(*inode));
-
-err_nolock_nocleanup:
return ret;
}