summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-21 14:56:00 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-10-21 14:56:33 +0200
commite5953cbdff26f7cbae7eff30cd9b18c4e19b7594 (patch)
tree9c039e5b6d0703f208aa1e1fbd10006c8cfd23b5
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
pipe: fix failure to return error code on ->confirm()for-2.6.37/misc
The arguments were transposed, we want to assign the error code to 'ret', which is being returned. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Cc: stable@kernel.org Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--fs/pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 279eef96c51c..37eb1ebeaa90 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;
}