]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
seqlock,lockdep: Fix seqcount_latch_init()
authorPeter Zijlstra <peterz@infradead.org>
Tue, 9 Mar 2021 14:21:18 +0000 (15:21 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 10 Mar 2021 08:51:45 +0000 (09:51 +0100)
seqcount_init() must be a macro in order to preserve the static
variable that is used for the lockdep key. Don't then wrap it in an
inline function, which destroys that.

Luckily there aren't many users of this function, but fix it before it
becomes a problem.

Fixes: 80793c3471d9 ("seqlock: Introduce seqcount_latch_t")
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/YEeFEbNUVkZaXDp4@hirez.programming.kicks-ass.net
include/linux/seqlock.h

index 2f7bb92b4c9eefcab01054659e9d1c3fd5b86cef..f61e34fbaaea4f9f9af9195335eae17608e56b52 100644 (file)
@@ -664,10 +664,7 @@ typedef struct {
  * seqcount_latch_init() - runtime initializer for seqcount_latch_t
  * @s: Pointer to the seqcount_latch_t instance
  */
-static inline void seqcount_latch_init(seqcount_latch_t *s)
-{
-       seqcount_init(&s->seqcount);
-}
+#define seqcount_latch_init(s) seqcount_init(&(s)->seqcount)
 
 /**
  * raw_read_seqcount_latch() - pick even/odd latch data copy