aboutsummaryrefslogtreecommitdiffstats
path: root/net
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
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')
-rw-r--r--net/9p/trans_fd.c4
-rw-r--r--net/bluetooth/bnep/core.c2
-rw-r--r--net/bluetooth/cmtp/core.c2
-rw-r--r--net/bluetooth/hidp/core.c2
-rw-r--r--net/core/datagram.c2
-rw-r--r--net/unix/af_unix.c4
6 files changed, 8 insertions, 8 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);
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index fbf251fef70f..5c4808b3da2d 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -484,7 +484,7 @@ static int bnep_session(void *arg)
484 struct net_device *dev = s->dev; 484 struct net_device *dev = s->dev;
485 struct sock *sk = s->sock->sk; 485 struct sock *sk = s->sock->sk;
486 struct sk_buff *skb; 486 struct sk_buff *skb;
487 wait_queue_t wait; 487 wait_queue_entry_t wait;
488 488
489 BT_DBG(""); 489 BT_DBG("");
490 490
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 9e59b6654126..14f7c8135c31 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -280,7 +280,7 @@ static int cmtp_session(void *arg)
280 struct cmtp_session *session = arg; 280 struct cmtp_session *session = arg;
281 struct sock *sk = session->sock->sk; 281 struct sock *sk = session->sock->sk;
282 struct sk_buff *skb; 282 struct sk_buff *skb;
283 wait_queue_t wait; 283 wait_queue_entry_t wait;
284 284
285 BT_DBG("session %p", session); 285 BT_DBG("session %p", session);
286 286
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 0bec4588c3c8..fc31161e98f2 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -1244,7 +1244,7 @@ static void hidp_session_run(struct hidp_session *session)
1244static int hidp_session_thread(void *arg) 1244static int hidp_session_thread(void *arg)
1245{ 1245{
1246 struct hidp_session *session = arg; 1246 struct hidp_session *session = arg;
1247 wait_queue_t ctrl_wait, intr_wait; 1247 wait_queue_entry_t ctrl_wait, intr_wait;
1248 1248
1249 BT_DBG("session %p", session); 1249 BT_DBG("session %p", session);
1250 1250
diff --git a/net/core/datagram.c b/net/core/datagram.c
index db1866f2ffcf..34678828e2bb 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -68,7 +68,7 @@ static inline int connection_based(struct sock *sk)
68 return sk->sk_type == SOCK_SEQPACKET || sk->sk_type == SOCK_STREAM; 68 return sk->sk_type == SOCK_SEQPACKET || sk->sk_type == SOCK_STREAM;
69} 69}
70 70
71static int receiver_wake_function(wait_queue_t *wait, unsigned int mode, int sync, 71static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, int sync,
72 void *key) 72 void *key)
73{ 73{
74 unsigned long bits = (unsigned long)key; 74 unsigned long bits = (unsigned long)key;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 1a0c961f4ffe..c77ced0109b7 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -343,7 +343,7 @@ found:
343 * are still connected to it and there's no way to inform "a polling 343 * are still connected to it and there's no way to inform "a polling
344 * implementation" that it should let go of a certain wait queue 344 * implementation" that it should let go of a certain wait queue
345 * 345 *
346 * In order to propagate a wake up, a wait_queue_t of the client 346 * In order to propagate a wake up, a wait_queue_entry_t of the client
347 * socket is enqueued on the peer_wait queue of the server socket 347 * socket is enqueued on the peer_wait queue of the server socket
348 * whose wake function does a wake_up on the ordinary client socket 348 * whose wake function does a wake_up on the ordinary client socket
349 * wait queue. This connection is established whenever a write (or 349 * wait queue. This connection is established whenever a write (or
@@ -352,7 +352,7 @@ found:
352 * was relayed. 352 * was relayed.
353 */ 353 */
354 354
355static int unix_dgram_peer_wake_relay(wait_queue_t *q, unsigned mode, int flags, 355static int unix_dgram_peer_wake_relay(wait_queue_entry_t *q, unsigned mode, int flags,
356 void *key) 356 void *key)
357{ 357{
358 struct unix_sock *u; 358 struct unix_sock *u;