---

yaml --- r: 132223 b: refs/heads/master c: e5bc49b h: refs/heads/master i: 132221: 925eef8 132219: 533234a 132215: 0a4b705 132207: 615c39f 132191: 676c7bf 132159: 09f476f 132095: 6a108b3 v: v3
git-mirror · Mar 12, 2009 · e633ec4 · e633ec4
1 parent 5de9b0f
commit e633ec4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d0df7a3d1ecbaf5d5602a59055c8ca993855bed
+refs/heads/master: e5bc49ba7439b9726006d031d440cba96819f0f8
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
@@ -699,12 +699,12 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on)
 	int retval;
 
 	mutex_lock(&inode->i_mutex);
-
 	retval = fasync_helper(fd, filp, on, &pipe->fasync_readers);
-
-	if (retval >= 0)
+	if (retval >= 0) {
 		retval = fasync_helper(fd, filp, on, &pipe->fasync_writers);
-
+		if (retval < 0) /* this can happen only if on == T */
+			fasync_helper(-1, filp, 0, &pipe->fasync_readers);
+	}
 	mutex_unlock(&inode->i_mutex);
 
 	if (retval < 0)