| From | "Ahmed S. Darwish" <> | Subject | [PATCH v1 2/5] seqlock: Use unique prefix for seqcount_t property accessors | Date | Fri, 28 Aug 2020 03:07:07 +0200 |
| |
At seqlock.h, the following set of functions:
- __seqcount_ptr() - __seqcount_preemptible() - __seqcount_assert()
act as plain seqcount_t "property" accessors. Meanwhile, the following group:
- __seqcount_ptr() - __seqcount_lock_preemptible() - __seqcount_assert_lock_held()
act as the equivalent set, but in the generic form, taking either seqcount_t or any of the seqcount_LOCKTYPE_t variants.
This is quite confusing, especially the first member where it is called exactly the same in both groups.
Differentiate the first group by using "__seqcount_t_" as prefix. This also conforms with the rest of seqlock.h naming conventions.
While at it, also constify the property accessors first parameter where appropriate.
References: 55f3560df975 ("seqlock: Extend seqcount API with associated locks") Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de> --- include/linux/seqlock.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 598af597f74e..5470e9cd52ce 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -183,13 +183,13 @@ __seqcount_##locktype##_ptr(seqcount_##locktype##_t *s) \ } \ \ static __always_inline bool \ -__seqcount_##locktype##_preemptible(seqcount_##locktype##_t *s) \ +__seqcount_##locktype##_preemptible(const seqcount_##locktype##_t *s) \ { \ return preemptible; \ } \ \ static __always_inline void \ -__seqcount_##locktype##_assert(seqcount_##locktype##_t *s) \ +__seqcount_##locktype##_assert(const seqcount_##locktype##_t *s) \ { \ __SEQ_LOCK(lockdep_assert_held(lockmember)); \ } @@ -198,17 +198,17 @@ __seqcount_##locktype##_assert(seqcount_##locktype##_t *s) \ * __seqprop() for seqcount_t */ -static inline seqcount_t *__seqcount_ptr(seqcount_t *s) +static inline seqcount_t *__seqcount_t_ptr(seqcount_t *s) { return s; } -static inline bool __seqcount_preemptible(seqcount_t *s) +static inline bool __seqcount_t_preemptible(const seqcount_t *s) { return false; } -static inline void __seqcount_assert(seqcount_t *s) +static inline void __seqcount_t_assert(const seqcount_t *s) { lockdep_assert_preemption_disabled(); } @@ -236,12 +236,11 @@ SEQCOUNT_LOCKTYPE(ww_mutex, struct ww_mutex, true, &s->lock->base) #define SEQCNT_MUTEX_ZERO(name, lock) SEQCOUNT_LOCKTYPE_ZERO(name, lock) #define SEQCNT_WW_MUTEX_ZERO(name, lock) SEQCOUNT_LOCKTYPE_ZERO(name, lock) - #define __seqprop_case(s, locktype, prop) \ seqcount_##locktype##_t: __seqcount_##locktype##_##prop((void *)(s)) #define __seqprop(s, prop) _Generic(*(s), \ - seqcount_t: __seqcount_##prop((void *)(s)), \ + seqcount_t: __seqcount_t_##prop((void *)(s)), \ __seqprop_case((s), raw_spinlock, prop), \ __seqprop_case((s), spinlock, prop), \ __seqprop_case((s), rwlock, prop), \ -- 2.28.0
|