From 07a5a5bfd3abe5baecd9994c14138e0c86c8053f Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Fri, 24 May 2013 15:55:24 -0700 Subject: [PATCH] --- yaml --- r: 376270 b: refs/heads/master c: 6900807c6b95dcb004902302b8ac5dbfbf6feb89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/aio.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 09eb96a797d4..ee5aeb1e54d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97c9266b11967e6401866b0111af59fa894180bf +refs/heads/master: 6900807c6b95dcb004902302b8ac5dbfbf6feb89 diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c index c5b1a8c10411..3fcdd73b6f1b 100644 --- a/trunk/fs/aio.c +++ b/trunk/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,