summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-21 14:56:00 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-22 10:47:34 -0800
commita835be5be324ccd5c99b4f95d9f79e6ebdb63ad5 (patch)
tree85af8004bab8e0043cb8ed638d297da2e82036f3
parent325d960fd9c0211aa32ecffb80edf430b9f9f87e (diff)
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>
-rw-r--r--fs/pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index ae17d026aaa3..d0cc080c732b 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;
}