projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2089b63
)
pipe: fix failure to return error code on ->confirm()
author
Nicolas Kaiser
<nikai@nikai.net>
Thu, 21 Oct 2010 12:56:00 +0000
(14:56 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 22 Nov 2010 19:03:06 +0000
(11:03 -0800)
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
patch
|
blob
|
history
diff --git
a/fs/pipe.c
b/fs/pipe.c
index 279eef96c51cdf28a81d4f0c3d0d702a71dc5a1c..37eb1ebeaa906ea068f940e6298f8cd632feacb4 100644
(file)
--- 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;
}