* [26/82] pipe: fix failure to return error code on ->confirm()
@ 2010-11-19 21:55 Greg KH
0 siblings, 0 replies; only message in thread
From: Greg KH @ 2010-11-19 21:55 UTC (permalink / raw)
To: linux-kernel, stable
Cc: stable-review, torvalds, akpm, alan, Nicolas Kaiser, Jens Axboe
2.6.35-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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-19 22:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-19 21:55 [26/82] pipe: fix failure to return error code on ->confirm() Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox