* [GIT PULL] Single misc fix for 2.6.37-rc1
@ 2010-10-22 10:47 Jens Axboe
0 siblings, 0 replies; only message in thread
From: Jens Axboe @ 2010-10-22 10:47 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel@vger.kernel.org
Hi Linus,
A recently discovered problem in fs/pipe.c can cause us to
lose the error returned from buf-ops->confirm().
Please pull.
git://git.kernel.dk/linux-2.6-block.git for-2.6.37/misc
Nicolas Kaiser (1):
pipe: fix failure to return error code on ->confirm()
fs/pipe.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/pipe.c b/fs/pipe.c
index 279eef9..37eb1eb 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
error = ops->confirm(pipe, buf);
if (error) {
if (!ret)
- error = ret;
+ ret = error;
break;
}
--
Jens Axboe
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-10-22 10:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-22 10:47 [GIT PULL] Single misc fix for 2.6.37-rc1 Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox