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>
This commit is contained in:
10
mm/filemap.c
10
mm/filemap.c
@@ -768,10 +768,10 @@ struct wait_page_key {
|
||||
struct wait_page_queue {
|
||||
struct page *page;
|
||||
int bit_nr;
|
||||
wait_queue_t wait;
|
||||
wait_queue_entry_t wait;
|
||||
};
|
||||
|
||||
static int wake_page_function(wait_queue_t *wait, unsigned mode, int sync, void *arg)
|
||||
static int wake_page_function(wait_queue_entry_t *wait, unsigned mode, int sync, void *arg)
|
||||
{
|
||||
struct wait_page_key *key = arg;
|
||||
struct wait_page_queue *wait_page
|
||||
@@ -834,7 +834,7 @@ static inline int wait_on_page_bit_common(wait_queue_head_t *q,
|
||||
struct page *page, int bit_nr, int state, bool lock)
|
||||
{
|
||||
struct wait_page_queue wait_page;
|
||||
wait_queue_t *wait = &wait_page.wait;
|
||||
wait_queue_entry_t *wait = &wait_page.wait;
|
||||
int ret = 0;
|
||||
|
||||
init_wait(wait);
|
||||
@@ -847,7 +847,7 @@ static inline int wait_on_page_bit_common(wait_queue_head_t *q,
|
||||
|
||||
if (likely(list_empty(&wait->task_list))) {
|
||||
if (lock)
|
||||
__add_wait_queue_tail_exclusive(q, wait);
|
||||
__add_wait_queue_entry_tail_exclusive(q, wait);
|
||||
else
|
||||
__add_wait_queue(q, wait);
|
||||
SetPageWaiters(page);
|
||||
@@ -907,7 +907,7 @@ int wait_on_page_bit_killable(struct page *page, int bit_nr)
|
||||
*
|
||||
* Add an arbitrary @waiter to the wait queue for the nominated @page.
|
||||
*/
|
||||
void add_page_wait_queue(struct page *page, wait_queue_t *waiter)
|
||||
void add_page_wait_queue(struct page *page, wait_queue_entry_t *waiter)
|
||||
{
|
||||
wait_queue_head_t *q = page_waitqueue(page);
|
||||
unsigned long flags;
|
||||
|
||||
Reference in New Issue
Block a user