diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2021-03-09 15:21:18 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-03-10 09:51:45 +0100 |
| commit | 4817a52b306136c8b2b2271d8770401441e4cf79 (patch) | |
| tree | 7b9bcc533db887192bee4e559dc4f4ed6a6a668d | |
| parent | u64_stats,lockdep: Fix u64_stats_init() vs lockdep (diff) | |
| download | linux-dev-4817a52b306136c8b2b2271d8770401441e4cf79.tar.xz linux-dev-4817a52b306136c8b2b2271d8770401441e4cf79.zip | |
seqlock,lockdep: Fix seqcount_latch_init()
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
| -rw-r--r-- | include/linux/seqlock.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 2f7bb92b4c9e..f61e34fbaaea 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -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 |