From: Nicolas Kaiser <nikai@nikai.net>
Date: Thu, 21 Oct 2010 12:56:00 +0000 (+0200)
Subject: pipe: fix failure to return error code on ->confirm()
X-Git-Tag: v2.6.33.8~409
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b96f78245da8bcb4eea3eee851de67aff2708cdf;p=karo-tx-linux.git

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: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/fs/pipe.c b/fs/pipe.c
index 37ba29ff3158..8087027e9ccb 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;
 			}