diff options
authorJeff Moyer <>2013-05-24 15:55:24 -0700
committerLinus Torvalds <>2013-05-24 16:22:52 -0700
commit6900807c6b95dcb004902302b8ac5dbfbf6feb89 (patch)
parent97c9266b11967e6401866b0111af59fa894180bf (diff)
aio: fix io_getevents documentation
In reviewing man pages, I noticed that io_getevents is documented to update the timeout that gets passed into the library call. This doesn't happen in kernel space or in the library (even though it's documented to do so in both places). Unless there is objection, I'd like to fix the comments/docs to match the code (I will also update the man page upon consensus). Signed-off-by: Jeff Moyer <> Signed-off-by: Benjamin LaHaise <> Acked-by: Cyril Hrubis <> Acked-by: Michael Kerrisk <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index c5b1a8c1041..3fcdd73b6f1 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1299,8 +1299,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
* < min_nr if the timeout specified by timeout has elapsed
* before sufficient events are available, where timeout == NULL
* specifies an infinite timeout. Note that the timeout pointed to by
- * timeout is relative and will be updated if not NULL and the
- * operation blocks. Will fail with -ENOSYS if not implemented.
+ * timeout is relative. Will fail with -ENOSYS if not implemented.
SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
long, min_nr,