From e633ec4175cef2481c802ee96df6ae2b8be4f771 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 12 Mar 2009 14:31:28 -0700
Subject: [PATCH] --- yaml --- r: 132223 b: refs/heads/master c:
 e5bc49ba7439b9726006d031d440cba96819f0f8 h: refs/heads/master i:   132221:
 925eef87eed96656b2cb2f72b16e03877cbb37f7   132219:
 533234a3cee45b679425529e59a95a44ccb5236f   132215:
 0a4b7057f20a86d70f1d24ebfd01be272aec9829   132207:
 615c39fbd6554f668cb1a5ddf0742233f87db053   132191:
 676c7bff629d53e7d0535eec8df18c07364ca480   132159:
 09f476f3fe97236259c49861ce48c60808ad9b60   132095:
 6a108b32c4d4a626d199403b5e12ab8b5b11f7a2 v: v3

---
 [refs]          | 2 +-
 trunk/fs/pipe.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9bfcd8bb598b..482a4f0b3494 100644
--- 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
index 3a48ba5179d5..14f502b89cf5 100644
--- 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)