[PATCH] pipe: don't block after data has been written

From: Max Kellermann
Date: Thu Nov 05 2009 - 10:40:25 EST

According to the select() / poll() documentation, a write operation on
a file descriptor which is "ready for writing" must not block. Linux
violates this rule: if you pass a very large buffer to write(), the
system call will not return until everything is written, or an error

This patch adds a simple check: if at least one byte has already been
written, break from the loop, instead of calling pipe_wait().

Signed-off-by: Max Kellermann <max@xxxxxxxxxxx>

fs/pipe.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/pipe.c b/fs/pipe.c
index ae17d02..9d84f0b 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -582,7 +582,7 @@ redo2:
if (bufs < PIPE_BUFFERS)
- if (filp->f_flags & O_NONBLOCK) {
+ if (filp->f_flags & O_NONBLOCK || ret > 0) {
if (!ret)
ret = -EAGAIN;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/