| Date | Fri, 19 Nov 2010 14:00:59 -0800 | From | Greg KH <> | Subject | [28/66] pipe: fix failure to return error code on ->confirm() |
| |
2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nicolas Kaiser <nikai@nikai.net>
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: Greg Kroah-Hartman <gregkh@suse.de>
--- fs/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/pipe.c +++ b/fs/pipe.c @@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const stru error = ops->confirm(pipe, buf); if (error) { if (!ret) - error = ret; + ret = error; break; }
|