diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-02-08 13:20:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:22:33 +0100 |
| commit | 7adfa2ff3efa02a7a9f2632d2d2662d3e5eb5304 (patch) | |
| tree | 8a312d527e25142c65eec3bf9360cfbaae4c2666 | |
| parent | Fix container_of() usage (diff) | |
| download | linux-7adfa2ff3efa02a7a9f2632d2d2662d3e5eb5304.tar.xz linux-7adfa2ff3efa02a7a9f2632d2d2662d3e5eb5304.zip | |
aio: partial write should not return error code
When an AIO write gets an error after writing some data (eg. ENOSPC), it
should return the amount written already, not the error. Just like write()
is supposed to.
This was found by the libaio test suite.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-By: Zach Brown <zach.brown@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/aio.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1347,6 +1347,13 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb) if ((ret == 0) || (iocb->ki_left == 0)) ret = iocb->ki_nbytes - iocb->ki_left; + /* If we managed to write some out we return that, rather than + * the eventual error. */ + if (opcode == IOCB_CMD_PWRITEV + && ret < 0 && ret != -EIOCBQUEUED && ret != -EIOCBRETRY + && iocb->ki_nbytes - iocb->ki_left) + ret = iocb->ki_nbytes - iocb->ki_left; + return ret; } |