| From 460c7c2e1b39e0e960f42a12dacc995797055c9b Mon Sep 17 00:00:00 2001 |
| From: Nicolas Kaiser <nikai@nikai.net> |
| Date: Thu, 21 Oct 2010 14:56:00 +0200 |
| Subject: [PATCH] pipe: fix failure to return error code on ->confirm() |
| |
| commit e5953cbdff26f7cbae7eff30cd9b18c4e19b7594 upstream. |
| |
| 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> |
| Signed-off-by: Jens Axboe <jaxboe@fusionio.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/pipe.c | 2 +- |
| 1 files changed, 1 insertions(+), 1 deletions(-) |
| |
| diff --git a/fs/pipe.c b/fs/pipe.c |
| index 37ba29f..8087027 100644 |
| --- a/fs/pipe.c |
| +++ b/fs/pipe.c |
| @@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov, |
| error = ops->confirm(pipe, buf); |
| if (error) { |
| if (!ret) |
| - error = ret; |
| + ret = error; |
| break; |
| } |
| |
| -- |
| 1.7.0.4 |
| |