Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21417136 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched/wait: Standardize 'struct wait_bit_queue' wait-queue entry field name 



Rename 'struct wait_bit_queue::wait' to ::wq_entry, to more clearly
name it as a wait-queue entry.

Propagate it to a couple of usage sites where the wait-bit-queue internals
are exposed.

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: default avatarIngo Molnar <mingo@kernel.org>
parent 9d9d676f

fs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1891,11 +1891,11 @@ static void __wait_on_freeing_inode(struct inode *inode) 
	wait_queue_head_t *wq;

	DEFINE_WAIT_BIT(wait, &inode->i_state, __I_NEW);

	wq = bit_waitqueue(&inode->i_state, __I_NEW);

	prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);

	prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

	spin_unlock(&inode->i_lock);

	spin_unlock(&inode_hash_lock);

	schedule();

	finish_wait(wq, &wait.wait);

	finish_wait(wq, &wait.wq_entry);

	spin_lock(&inode_hash_lock);

}
@@ -2038,11 +2038,11 @@ static void __inode_dio_wait(struct inode *inode) 
	DEFINE_WAIT_BIT(q, &inode->i_state, __I_DIO_WAKEUP);



	do {

		prepare_to_wait(wq, &q.wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(wq, &q.wq_entry, TASK_UNINTERRUPTIBLE);

		if (atomic_read(&inode->i_dio_count))

			schedule();

	} while (atomic_read(&inode->i_dio_count));

	finish_wait(wq, &q.wait);

	finish_wait(wq, &q.wq_entry);

}



/**

fs/jbd2/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -2579,10 +2579,10 @@ void jbd2_journal_release_jbd_inode(journal_t *journal, 
		wait_queue_head_t *wq;

		DEFINE_WAIT_BIT(wait, &jinode->i_flags, __JI_COMMIT_RUNNING);

		wq = bit_waitqueue(&jinode->i_flags, __JI_COMMIT_RUNNING);

		prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

		spin_unlock(&journal->j_list_lock);

		schedule();

		finish_wait(wq, &wait.wait);

		finish_wait(wq, &wait.wq_entry);

		goto restart;

	}

fs/xfs/xfs_icache.c

+2 −2
Original line number Diff line number Diff line
@@ -269,12 +269,12 @@ xfs_inew_wait( 
	DEFINE_WAIT_BIT(wait, &ip->i_flags, __XFS_INEW_BIT);



	do {

		prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

		if (!xfs_iflags_test(ip, XFS_INEW))

			break;

		schedule();

	} while (true);

	finish_wait(wq, &wait.wait);

	finish_wait(wq, &wait.wq_entry);

}



/*

fs/xfs/xfs_inode.c

+4 −4
Original line number Diff line number Diff line
@@ -622,12 +622,12 @@ __xfs_iflock( 
	DEFINE_WAIT_BIT(wait, &ip->i_flags, __XFS_IFLOCK_BIT);



	do {

		prepare_to_wait_exclusive(wq, &wait.wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait_exclusive(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

		if (xfs_isiflocked(ip))

			io_schedule();

	} while (!xfs_iflock_nowait(ip));



	finish_wait(wq, &wait.wait);

	finish_wait(wq, &wait.wq_entry);

}



STATIC uint
@@ -2486,11 +2486,11 @@ __xfs_iunpin_wait( 
	xfs_iunpin(ip);



	do {

		prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

		if (xfs_ipincount(ip))

			io_schedule();

	} while (xfs_ipincount(ip));

	finish_wait(wq, &wait.wait);

	finish_wait(wq, &wait.wq_entry);

}



void

include/linux/wait.h

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct wait_bit_key { 


struct wait_bit_queue {

	struct wait_bit_key	key;

	struct wait_queue_entry	wait;

	struct wait_queue_entry	wq_entry;

};



struct wait_queue_head {
@@ -991,11 +991,11 @@ int wake_bit_function(struct wait_queue_entry *wq_entry, unsigned mode, int sync 
#define DEFINE_WAIT_BIT(name, word, bit)				\

	struct wait_bit_queue name = {					\

		.key = __WAIT_BIT_KEY_INITIALIZER(word, bit),		\

		.wait	= {						\

		.wq_entry = {						\

			.private	= current,			\

			.func		= wake_bit_function,		\

			.task_list	=				\

				LIST_HEAD_INIT((name).wait.task_list),	\

				LIST_HEAD_INIT((name).wq_entry.task_list), \

		},							\

	}