diff options
| author | Nicolas Kaiser <nikai@nikai.net> | 2010-10-21 14:56:00 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-06 18:08:22 -0500 |
| commit | 60534386c08a9bea1049415f88b8c976d27d5be0 (patch) | |
| tree | 2033c4bc5ddc6b9fe6e23471938337d7fd352348 /fs | |
| parent | 69536bef5b84796e183b96fbc6f1dac1dce6dfd1 (diff) | |
| download | lwn-60534386c08a9bea1049415f88b8c976d27d5be0.tar.gz lwn-60534386c08a9bea1049415f88b8c976d27d5be0.zip | |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'fs')
| -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 37ba29ff3158..8087027e9ccb 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; } |