[PATCH v3 01/10] io_uring: rename the wait queue entry field

[Pavel Begunkov <asml.silence@gmail.com>]

"wq" usually stands for wait queue and not for entries. Rename the
wait_queue_entry field in struct io_wait_queue to "wqe" to avoid
confusion. It's just a cosmetic change.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/io_uring.c | 14 +++++++-------
 io_uring/io_uring.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index d11d0e9723a1..3eb4c9200bb2 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2453,7 +2453,7 @@ int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr)
 static int io_wake_function(struct wait_queue_entry *curr, unsigned int mode,
 			    int wake_flags, void *key)
 {
-	struct io_wait_queue *iowq = container_of(curr, struct io_wait_queue, wq);
+	struct io_wait_queue *iowq = container_of(curr, struct io_wait_queue, wqe);
 
 	/*
 	 * Cannot safely flush overflowed CQEs from here, ensure we wake up
@@ -2493,7 +2493,7 @@ static enum hrtimer_restart io_cqring_timer_wakeup(struct hrtimer *timer)
 
 	WRITE_ONCE(iowq->hit_timeout, 1);
 	iowq->min_timeout = 0;
-	wake_up_process(iowq->wq.private);
+	wake_up_process(iowq->wqe.private);
 	return HRTIMER_NORESTART;
 }
 
@@ -2646,9 +2646,9 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, u32 flags,
 	if (__io_cqring_events_user(ctx) >= min_events)
 		return 0;
 
-	init_waitqueue_func_entry(&iowq.wq, io_wake_function);
-	iowq.wq.private = current;
-	INIT_LIST_HEAD(&iowq.wq.entry);
+	init_waitqueue_func_entry(&iowq.wqe, io_wake_function);
+	iowq.wqe.private = current;
+	INIT_LIST_HEAD(&iowq.wqe.entry);
 	iowq.ctx = ctx;
 	iowq.cq_tail = READ_ONCE(ctx->rings->cq.head) + min_events;
 	iowq.cq_min_tail = READ_ONCE(ctx->rings->cq.tail);
@@ -2695,7 +2695,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, u32 flags,
 			atomic_set(&ctx->cq_wait_nr, nr_wait);
 			set_current_state(TASK_INTERRUPTIBLE);
 		} else {
-			prepare_to_wait_exclusive(&ctx->cq_wait, &iowq.wq,
+			prepare_to_wait_exclusive(&ctx->cq_wait, &iowq.wqe,
 							TASK_INTERRUPTIBLE);
 		}
 
@@ -2743,7 +2743,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, u32 flags,
 	} while (1);
 
 	if (!(ctx->flags & IORING_SETUP_DEFER_TASKRUN))
-		finish_wait(&ctx->cq_wait, &iowq.wq);
+		finish_wait(&ctx->cq_wait, &iowq.wqe);
 	restore_saved_sigmask_unless(ret == -EINTR);
 
 	return READ_ONCE(rings->cq.head) == READ_ONCE(rings->cq.tail) ? ret : 0;
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 23c268ab1c8f..53bc3ef14f9e 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -102,7 +102,7 @@ struct io_defer_entry {
 };
 
 struct io_wait_queue {
-	struct wait_queue_entry wq;
+	struct wait_queue_entry wqe;
 	struct io_ring_ctx *ctx;
 	unsigned cq_tail;
 	unsigned cq_min_tail;
-- 
2.49.0