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.37-rc1~165^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e5953cbdff26f7cbae7eff30cd9b18c4e19b7594

pipe: fix failure to return error code on ->confirm()

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>
---

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;
 			}