[PATCH 15/15] Use ctx consistently for io_context_t instead of ctx_id

Signed-off-by: Guillem Jover <guillem@hadrons.org>
Gbp-Pq: Name 0015-Use-ctx-consistently-for-io_context_t-instead-of-ctx.patch

diff --git a/man/io_cancel.3 b/man/io_cancel.3
index 25dfec4e16c01672fbc9d418fc43bba9569fb84a..e69f926217276655249930077fd38ccd831677db 100644 (file)
--- a/man/io_cancel.3
+++ b/man/io_cancel.3
@@ -46,7 +46,7 @@ If any of the data structures pointed to are invalid.
 If
 .I aio_context
 specified by
-.I ctx_id
+.I ctx
 is invalid.
 .TP
 .B EAGAIN

diff --git a/man/io_getevents.3 b/man/io_getevents.3
index 623752c13343fc535d124a570acc468c4d4894ca..10b6eb9af429f16ae88a2742fdf7850c3c8f6c5f 100644 (file)
--- a/man/io_getevents.3
+++ b/man/io_getevents.3
@@ -1,7 +1,7 @@
 .\"/* io_getevents:
 .\" *      Attempts to read at least min_nr events and up to nr events from
-.\" *      the completion queue for the aio_context specified by ctx_id.  May
-.\" *      fail with -EINVAL if ctx_id is invalid, if min_nr is out of range,
+.\" *      the completion queue for the aio_context specified by ctx.  May
+.\" *      fail with -EINVAL if ctx is invalid, if min_nr is out of range,
 .\" *      if nr is out of range, if when is out of range.  May fail with
 .\" *      -EFAULT if any of the memory specified to is invalid.  May return
 .\" *      0 or < min_nr if no events are available and the timeout specified
@@ -10,7 +10,7 @@
 .\" *      will be updated if not NULL and the operation blocks.  Will fail
 .\" *      with -ENOSYS if not implemented.
 .\" */
-.\"asmlinkage long sys_io_getevents(io_context_t ctx_id,
+.\"asmlinkage long sys_io_getevents(io_context_t ctx,
 .\"                                 long min_nr,
 .\"                                 long nr,
 .\"                                 struct io_event *events,
@@ -117,7 +117,7 @@ behaves the same as
 .TP
 .B EINVAL 
 If
-.I ctx_id
+.I ctx
 is invalid, if
 .I min_nr
 is out of range, if

diff --git a/man/io_queue_run.3 b/man/io_queue_run.3
index 05e188aaea6c97003de4460e468ae8e74a3b2f57..d89b2855b5aba63f6e0aaddd838ff83f5315d091 100644 (file)
--- a/man/io_queue_run.3
+++ b/man/io_queue_run.3
@@ -16,7 +16,7 @@ io_queue_run \- Handle completed io requests
 .BR io_queue_run ()
 attempts to read all the events from
 the completion queue for the aio_context specified by
-.IR ctx_id .
+.IR ctx .
 .SH "RETURN VALUES"
 May return
 .B 0

diff --git a/man/io_queue_wait.3 b/man/io_queue_wait.3
index 96b61f7726aee6f3c85018aeabc61ab07e1944c4..563e125ee7565b372077535cd999949c23ffc1fe 100644 (file)
--- a/man/io_queue_wait.3
+++ b/man/io_queue_wait.3
@@ -15,7 +15,7 @@ io_queue_wait \- Wait for io requests to complete
 .BR io_queue_wait ()
 attempts to read an event from
 the completion queue for the aio_context specified by
-.IR ctx_id .
+.IR ctx .
 .SH "RETURN VALUES"
 May return
 .B 0

diff --git a/man/io_submit.3 b/man/io_submit.3
index 7f4e27a8e7cae7d334f19a3a9e3e5e920ee5fd80..34a189e12256e664fc2fc0d37429f3f8b2d0e3a0 100644 (file)
--- a/man/io_submit.3
+++ b/man/io_submit.3
@@ -1,7 +1,7 @@
 .\"/* sys_io_submit:
 .\" *      Queue the nr iocbs pointed to by iocbpp for processing.  Returns
 .\" *      the number of iocbs queued.  May return -EINVAL if the aio_context
-.\" *      specified by ctx_id is invalid, if nr is < 0, if the iocb at
+.\" *      specified by ctx is invalid, if nr is < 0, if the iocb at
 .\" *      *iocbpp[0] is not properly initialized, if the operation specified
 .\" *      is invalid for the file descriptor in the iocb.  May fail with
 .\" *      -EFAULT if any of the data structures point to invalid data.  May

diff --git a/src/compat-0_1.c b/src/compat-0_1.c
index 136396f99638adacb16a649b8717f2dd0310b38f..722e107444f533ba7ef50338af5e7cd0a8c76c4f 100644 (file)
--- a/src/compat-0_1.c
+++ b/src/compat-0_1.c
@@ -49,14 +49,14 @@ int compat0_1_io_queue_wait(io_context_t ctx, struct timespec *when)
 
 /* ABI change.  Provide backwards compatibility for this one. */
 SYMVER(compat0_1_io_getevents, io_getevents, 0.1);
-int compat0_1_io_getevents(io_context_t ctx_id, long nr,
+int compat0_1_io_getevents(io_context_t ctx, long nr,
                       struct io_event *events,
                       const struct timespec *const_timeout)
 {
        struct timespec timeout;
        if (const_timeout)
                timeout = *const_timeout;
-       return io_getevents(ctx_id, 1, nr, events,
+       return io_getevents(ctx, 1, nr, events,
                        const_timeout ? &timeout : NULL);
 }
 

diff --git a/src/libaio.h b/src/libaio.h
index 5bc43594f69cea48b8656a61f32b3100cd47650b..c748454df7c81da9ab223689dc86ecad4f004ba8 100644 (file)
--- a/src/libaio.h
+++ b/src/libaio.h
@@ -168,8 +168,8 @@ extern int io_setup(int maxevents, io_context_t *ctxp);
 extern int io_destroy(io_context_t ctx);
 extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]);
 extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt);
-extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout);
-extern int io_pgetevents(io_context_t ctx_id, long min_nr, long nr,
+extern int io_getevents(io_context_t ctx, long min_nr, long nr, struct io_event *events, struct timespec *timeout);
+extern int io_pgetevents(io_context_t ctx, long min_nr, long nr,
                struct io_event *events, struct timespec *timeout,
                sigset_t *sigmask);
 

diff --git a/src/vsys_def.h b/src/vsys_def.h
index 13d032e330b25d63ea6efc7e59ef27f780e8aba1..dd711dc7836754db35d2b21fe67daea7557d460d 100644 (file)
--- a/src/vsys_def.h
+++ b/src/vsys_def.h
@@ -20,5 +20,5 @@ extern int vsys_io_destroy(io_context_t ctx);
 extern int vsys_io_submit(io_context_t ctx, long nr, struct iocb *iocbs[]);
 extern int vsys_io_cancel(io_context_t ctx, struct iocb *iocb);
 extern int vsys_io_wait(io_context_t ctx, struct iocb *iocb, const struct timespec *when);
-extern int vsys_io_getevents(io_context_t ctx_id, long nr, struct io_event *events, const struct timespec *timeout);
+extern int vsys_io_getevents(io_context_t ctx, long nr, struct io_event *events, const struct timespec *timeout);