diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-05 05:25:39 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-06-20 06:18:28 -0400 |
commit | 2141713616c652aeabf2dd5c1e89bc601c4fed6a (patch) | |
tree | 506baaf0994e1279805c4991bc904c5fbcaa9ed3 /fs/inode.c | |
parent | 9d9d676f595b5081326be7a17dc681fcb38fb3b2 (diff) |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index db5914783a71..70761d6cafcd 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1891,11 +1891,11 @@ static void __wait_on_freeing_inode(struct inode *inode) | |||
1891 | wait_queue_head_t *wq; | 1891 | wait_queue_head_t *wq; |
1892 | DEFINE_WAIT_BIT(wait, &inode->i_state, __I_NEW); | 1892 | DEFINE_WAIT_BIT(wait, &inode->i_state, __I_NEW); |
1893 | wq = bit_waitqueue(&inode->i_state, __I_NEW); | 1893 | wq = bit_waitqueue(&inode->i_state, __I_NEW); |
1894 | prepare_to_wait(wq, &wait.wait, TASK_UNINTERRUPTIBLE); | 1894 | prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE); |
1895 | spin_unlock(&inode->i_lock); | 1895 | spin_unlock(&inode->i_lock); |
1896 | spin_unlock(&inode_hash_lock); | 1896 | spin_unlock(&inode_hash_lock); |
1897 | schedule(); | 1897 | schedule(); |
1898 | finish_wait(wq, &wait.wait); | 1898 | finish_wait(wq, &wait.wq_entry); |
1899 | spin_lock(&inode_hash_lock); | 1899 | spin_lock(&inode_hash_lock); |
1900 | } | 1900 | } |
1901 | 1901 | ||
@@ -2038,11 +2038,11 @@ static void __inode_dio_wait(struct inode *inode) | |||
2038 | DEFINE_WAIT_BIT(q, &inode->i_state, __I_DIO_WAKEUP); | 2038 | DEFINE_WAIT_BIT(q, &inode->i_state, __I_DIO_WAKEUP); |
2039 | 2039 | ||
2040 | do { | 2040 | do { |
2041 | prepare_to_wait(wq, &q.wait, TASK_UNINTERRUPTIBLE); | 2041 | prepare_to_wait(wq, &q.wq_entry, TASK_UNINTERRUPTIBLE); |
2042 | if (atomic_read(&inode->i_dio_count)) | 2042 | if (atomic_read(&inode->i_dio_count)) |
2043 | schedule(); | 2043 | schedule(); |
2044 | } while (atomic_read(&inode->i_dio_count)); | 2044 | } while (atomic_read(&inode->i_dio_count)); |
2045 | finish_wait(wq, &q.wait); | 2045 | finish_wait(wq, &q.wq_entry); |
2046 | } | 2046 | } |
2047 | 2047 | ||
2048 | /** | 2048 | /** |