浏览代码

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>
Linus Torvalds 19 年之前
父节点
当前提交
d19e997408
共有 1 个文件被更改,包括 1 次插入6 次删除
  1. 1 6
      fs/fifo.c

+ 1 - 6
fs/fifo.c

@@ -34,10 +34,7 @@ static int fifo_open(struct inode *inode, struct file *filp)
 {
 {
 	int ret;
 	int ret;
 
 
-	ret = -ERESTARTSYS;
-	if (mutex_lock_interruptible(PIPE_MUTEX(*inode)))
-		goto err_nolock_nocleanup;
-
+	mutex_lock(PIPE_MUTEX(*inode));
 	if (!inode->i_pipe) {
 	if (!inode->i_pipe) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;
 		if(!pipe_new(inode))
 		if(!pipe_new(inode))
@@ -140,8 +137,6 @@ err:
 
 
 err_nocleanup:
 err_nocleanup:
 	mutex_unlock(PIPE_MUTEX(*inode));
 	mutex_unlock(PIPE_MUTEX(*inode));
-
-err_nolock_nocleanup:
 	return ret;
 	return ret;
 }
 }