On Wednesday 09 January 2008 06:07:51 Jeff Moyer wrote:
> I've been keeping a copy on rhlinux.redhat.com. You can access it
> via:
>
> cvs -d :pserver:[EMAIL PROTECTED]:/usr/local/CVS login # no
> password cvs -d :pserver:[EMAIL PROTECTED]:/usr/local/CVS co
> libaio
Excellent! I'll feed you patches from now on then, should I find anything
else.
> When I'm happy with the regression tests (they
> don't all pass for me on 2.6.24-rc7), I'll roll a new version and
> build it for Fedora.
Did you see my two kernel patches to fix them? Attached for your
convenience...
Rusty.
An AIO read or write should return -EINVAL if the offset is negative.
This check matches the one in pread and pwrite.
This was found by the libaio test suite.
Signed-off-by: Rusty Russell <[EMAIL PROTECTED]>
---
fs/aio.c | 4 ++++
1 file changed, 4 insertions(+)
diff -r 18802689361a fs/aio.c
--- a/fs/aio.c Thu Jan 03 15:22:24 2008 +1100
+++ b/fs/aio.c Thu Jan 03 18:05:25 2008 +1100
@@ -1330,6 +1330,10 @@ static ssize_t aio_rw_vect_retry(struct
opcode = IOCB_CMD_PWRITEV;
}
+ /* This matches the pread()/pwrite() logic */
+ if (iocb->ki_pos < 0)
+ return -EINVAL;
+
do {
ret = rw_op(iocb, &iocb->ki_iovec[iocb->ki_cur_seg],
iocb->ki_nr_segs - iocb->ki_cur_seg,
When an AIO write gets a non-retry 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 <[EMAIL PROTECTED]>
Acked-By: Zach Brown <[EMAIL PROTECTED]>
---
fs/aio.c | 7 +++++++
1 file changed, 7 insertions(+)
diff -r 18802689361a fs/aio.c
--- a/fs/aio.c Thu Jan 03 15:22:24 2008 +1100
+++ b/fs/aio.c Thu Jan 03 18:05:25 2008 +1100
@@ -1346,6 +1350,13 @@ static ssize_t aio_rw_vect_retry(struct
/* This means we must have transferred all that we could */
/* No need to retry anymore */
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;
--
Ubuntu-devel-discuss mailing list
Ubuntu-devel-discuss@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-discuss
