Skip to content

Commit 434e09e

Browse files
Waiman-LongPeter Zijlstra
authored andcommitted
locking/qrwlock: Change "queue rwlock" to "queued rwlock"
Queued rwlock was originally named "queue rwlock" which wasn't quite grammatically correct. However there are still some "queue rwlock" references in the code. Change those to "queued rwlock" for consistency. Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20220510192134.434753-1-longman@redhat.com
1 parent deaf7c4 commit 434e09e

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

include/asm-generic/qrwlock.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ extern void queued_read_lock_slowpath(struct qrwlock *lock);
3333
extern void queued_write_lock_slowpath(struct qrwlock *lock);
3434

3535
/**
36-
* queued_read_trylock - try to acquire read lock of a queue rwlock
37-
* @lock : Pointer to queue rwlock structure
36+
* queued_read_trylock - try to acquire read lock of a queued rwlock
37+
* @lock : Pointer to queued rwlock structure
3838
* Return: 1 if lock acquired, 0 if failed
3939
*/
4040
static inline int queued_read_trylock(struct qrwlock *lock)
@@ -52,8 +52,8 @@ static inline int queued_read_trylock(struct qrwlock *lock)
5252
}
5353

5454
/**
55-
* queued_write_trylock - try to acquire write lock of a queue rwlock
56-
* @lock : Pointer to queue rwlock structure
55+
* queued_write_trylock - try to acquire write lock of a queued rwlock
56+
* @lock : Pointer to queued rwlock structure
5757
* Return: 1 if lock acquired, 0 if failed
5858
*/
5959
static inline int queued_write_trylock(struct qrwlock *lock)
@@ -68,8 +68,8 @@ static inline int queued_write_trylock(struct qrwlock *lock)
6868
_QW_LOCKED));
6969
}
7070
/**
71-
* queued_read_lock - acquire read lock of a queue rwlock
72-
* @lock: Pointer to queue rwlock structure
71+
* queued_read_lock - acquire read lock of a queued rwlock
72+
* @lock: Pointer to queued rwlock structure
7373
*/
7474
static inline void queued_read_lock(struct qrwlock *lock)
7575
{
@@ -84,8 +84,8 @@ static inline void queued_read_lock(struct qrwlock *lock)
8484
}
8585

8686
/**
87-
* queued_write_lock - acquire write lock of a queue rwlock
88-
* @lock : Pointer to queue rwlock structure
87+
* queued_write_lock - acquire write lock of a queued rwlock
88+
* @lock : Pointer to queued rwlock structure
8989
*/
9090
static inline void queued_write_lock(struct qrwlock *lock)
9191
{
@@ -98,8 +98,8 @@ static inline void queued_write_lock(struct qrwlock *lock)
9898
}
9999

100100
/**
101-
* queued_read_unlock - release read lock of a queue rwlock
102-
* @lock : Pointer to queue rwlock structure
101+
* queued_read_unlock - release read lock of a queued rwlock
102+
* @lock : Pointer to queued rwlock structure
103103
*/
104104
static inline void queued_read_unlock(struct qrwlock *lock)
105105
{
@@ -110,8 +110,8 @@ static inline void queued_read_unlock(struct qrwlock *lock)
110110
}
111111

112112
/**
113-
* queued_write_unlock - release write lock of a queue rwlock
114-
* @lock : Pointer to queue rwlock structure
113+
* queued_write_unlock - release write lock of a queued rwlock
114+
* @lock : Pointer to queued rwlock structure
115115
*/
116116
static inline void queued_write_unlock(struct qrwlock *lock)
117117
{
@@ -120,7 +120,7 @@ static inline void queued_write_unlock(struct qrwlock *lock)
120120

121121
/**
122122
* queued_rwlock_is_contended - check if the lock is contended
123-
* @lock : Pointer to queue rwlock structure
123+
* @lock : Pointer to queued rwlock structure
124124
* Return: 1 if lock contended, 0 otherwise
125125
*/
126126
static inline int queued_rwlock_is_contended(struct qrwlock *lock)
@@ -130,7 +130,7 @@ static inline int queued_rwlock_is_contended(struct qrwlock *lock)
130130

131131
/*
132132
* Remapping rwlock architecture specific functions to the corresponding
133-
* queue rwlock functions.
133+
* queued rwlock functions.
134134
*/
135135
#define arch_read_lock(l) queued_read_lock(l)
136136
#define arch_write_lock(l) queued_write_lock(l)

include/asm-generic/qrwlock_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <asm/spinlock_types.h>
88

99
/*
10-
* The queue read/write lock data structure
10+
* The queued read/write lock data structure
1111
*/
1212

1313
typedef struct qrwlock {

kernel/locking/qrwlock.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <trace/events/lock.h>
1616

1717
/**
18-
* queued_read_lock_slowpath - acquire read lock of a queue rwlock
19-
* @lock: Pointer to queue rwlock structure
18+
* queued_read_lock_slowpath - acquire read lock of a queued rwlock
19+
* @lock: Pointer to queued rwlock structure
2020
*/
2121
void queued_read_lock_slowpath(struct qrwlock *lock)
2222
{
@@ -60,8 +60,8 @@ void queued_read_lock_slowpath(struct qrwlock *lock)
6060
EXPORT_SYMBOL(queued_read_lock_slowpath);
6161

6262
/**
63-
* queued_write_lock_slowpath - acquire write lock of a queue rwlock
64-
* @lock : Pointer to queue rwlock structure
63+
* queued_write_lock_slowpath - acquire write lock of a queued rwlock
64+
* @lock : Pointer to queued rwlock structure
6565
*/
6666
void queued_write_lock_slowpath(struct qrwlock *lock)
6767
{

0 commit comments

Comments
 (0)