summaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-06-20 06:06:13 -0400
committerIngo Molnar <mingo@kernel.org>2017-06-20 06:18:27 -0400
commitac6424b981bce1c4bc55675c6ce11bfe1bbfa64f (patch)
treea9312337219777a9d3fb65d4673bbc6b5eeacd9c /net/9p
parent9705596d08ac87c18aee32cc97f2783b7d14624e (diff)
sched/wait: Rename wait_queue_t => wait_queue_entry_t
Rename: wait_queue_t => wait_queue_entry_t 'wait_queue_t' was always a slight misnomer: its name implies that it's a "queue", but in reality it's a queue *entry*. The 'real' queue is the wait queue head, which had to carry the name. Start sorting this out by renaming it to 'wait_queue_entry_t'. This also allows the real structure name 'struct __wait_queue' to lose its double underscore and become 'struct wait_queue_entry', which is the more canonical nomenclature for such data types. Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_fd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 7bc2208b6cc4..dca3cdd1a014 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -95,7 +95,7 @@ enum {
95 95
96struct p9_poll_wait { 96struct p9_poll_wait {
97 struct p9_conn *conn; 97 struct p9_conn *conn;
98 wait_queue_t wait; 98 wait_queue_entry_t wait;
99 wait_queue_head_t *wait_addr; 99 wait_queue_head_t *wait_addr;
100}; 100};
101 101
@@ -522,7 +522,7 @@ error:
522 clear_bit(Wworksched, &m->wsched); 522 clear_bit(Wworksched, &m->wsched);
523} 523}
524 524
525static int p9_pollwake(wait_queue_t *wait, unsigned int mode, int sync, void *key) 525static int p9_pollwake(wait_queue_entry_t *wait, unsigned int mode, int sync, void *key)
526{ 526{
527 struct p9_poll_wait *pwait = 527 struct p9_poll_wait *pwait =
528 container_of(wait, struct p9_poll_wait, wait); 528 container_of(wait, struct p9_poll_wait, wait);