diff options
| author | Nicolas Kaiser <nikai@nikai.net> | 2010-10-21 14:56:00 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-21 14:56:33 +0200 |
| commit | e5953cbdff26f7cbae7eff30cd9b18c4e19b7594 (patch) | |
| tree | 9c039e5b6d0703f208aa1e1fbd10006c8cfd23b5 /fs/pipe.c | |
| parent | Linux 2.6.36 (diff) | |
| download | linux-e5953cbdff26f7cbae7eff30cd9b18c4e19b7594.tar.xz linux-e5953cbdff26f7cbae7eff30cd9b18c4e19b7594.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | fs/pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |