From 4b50bd7b86d77e8677667d260ae9b0adc8be9780 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 18 Dec 2018 19:46:02 +0800 Subject: [PATCH] os/bluestore: s/event/events/ because `events` is an array, so name it with a plural name. Signed-off-by: Alan Somers --- src/os/bluestore/aio.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/bluestore/aio.cc b/src/os/bluestore/aio.cc index 379bd9c9efa..eb0c13fe958 100644 --- a/src/os/bluestore/aio.cc +++ b/src/os/bluestore/aio.cc @@ -74,7 +74,7 @@ int aio_queue_t::submit_batch(aio_iter begin, aio_iter end, int aio_queue_t::get_next_completed(int timeout_ms, aio_t **paio, int max) { #if defined(HAVE_LIBAIO) - io_event event[max]; + io_event events[max]; #elif defined(HAVE_POSIXAIO) struct kevent events[max]; #endif @@ -86,7 +86,7 @@ int aio_queue_t::get_next_completed(int timeout_ms, aio_t **paio, int max) int r = 0; do { #if defined(HAVE_LIBAIO) - r = io_getevents(ctx, 1, max, event, &t); + r = io_getevents(ctx, 1, max, events, &t); #elif defined(HAVE_POSIXAIO) r = kevent(ctx, NULL, 0, events, max, &t); if (r < 0) @@ -96,8 +96,8 @@ int aio_queue_t::get_next_completed(int timeout_ms, aio_t **paio, int max) for (int i=0; irval = event[i].res; + paio[i] = (aio_t *)events[i].obj; + paio[i]->rval = events[i].res; #else paio[i] = (aio_t*)events[i].udata; if (paio[i]->n_aiocb == 1) {