Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Waiman Long and committed by
Peter Zijlstra
434e09e7 deaf7c4b

+19 -19
+14 -14
include/asm-generic/qrwlock.h
··· 33 33 extern void queued_write_lock_slowpath(struct qrwlock *lock); 34 34 35 35 /** 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 38 38 * Return: 1 if lock acquired, 0 if failed 39 39 */ 40 40 static inline int queued_read_trylock(struct qrwlock *lock) ··· 52 52 } 53 53 54 54 /** 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 57 57 * Return: 1 if lock acquired, 0 if failed 58 58 */ 59 59 static inline int queued_write_trylock(struct qrwlock *lock) ··· 68 68 _QW_LOCKED)); 69 69 } 70 70 /** 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 73 73 */ 74 74 static inline void queued_read_lock(struct qrwlock *lock) 75 75 { ··· 84 84 } 85 85 86 86 /** 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 89 89 */ 90 90 static inline void queued_write_lock(struct qrwlock *lock) 91 91 { ··· 98 98 } 99 99 100 100 /** 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 103 103 */ 104 104 static inline void queued_read_unlock(struct qrwlock *lock) 105 105 { ··· 110 110 } 111 111 112 112 /** 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 115 115 */ 116 116 static inline void queued_write_unlock(struct qrwlock *lock) 117 117 { ··· 120 120 121 121 /** 122 122 * queued_rwlock_is_contended - check if the lock is contended 123 - * @lock : Pointer to queue rwlock structure 123 + * @lock : Pointer to queued rwlock structure 124 124 * Return: 1 if lock contended, 0 otherwise 125 125 */ 126 126 static inline int queued_rwlock_is_contended(struct qrwlock *lock) ··· 130 130 131 131 /* 132 132 * Remapping rwlock architecture specific functions to the corresponding 133 - * queue rwlock functions. 133 + * queued rwlock functions. 134 134 */ 135 135 #define arch_read_lock(l) queued_read_lock(l) 136 136 #define arch_write_lock(l) queued_write_lock(l)
+1 -1
include/asm-generic/qrwlock_types.h
··· 7 7 #include <asm/spinlock_types.h> 8 8 9 9 /* 10 - * The queue read/write lock data structure 10 + * The queued read/write lock data structure 11 11 */ 12 12 13 13 typedef struct qrwlock {
+4 -4
kernel/locking/qrwlock.c
··· 15 15 #include <trace/events/lock.h> 16 16 17 17 /** 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 20 20 */ 21 21 void queued_read_lock_slowpath(struct qrwlock *lock) 22 22 { ··· 60 60 EXPORT_SYMBOL(queued_read_lock_slowpath); 61 61 62 62 /** 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 65 65 */ 66 66 void queued_write_lock_slowpath(struct qrwlock *lock) 67 67 {