An upcoming ringbuffer support for continuous lines will allow to reopen records with DESC_COMMITTED_MASK set. As a result, the flag will no longer describe the final committed state. Rename it to DESC_COMMIT_MASK as a preparation step.
Signed-off-by: John Ogness <[email protected]> Reviewed-by: Petr Mladek <[email protected]> --- kernel/printk/printk_ringbuffer.c | 8 ++++---- kernel/printk/printk_ringbuffer.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c index 0659b50872b5..76248c82d557 100644 --- a/kernel/printk/printk_ringbuffer.c +++ b/kernel/printk/printk_ringbuffer.c @@ -361,7 +361,7 @@ static enum desc_state get_desc_state(unsigned long id, if (state_val & DESC_REUSE_MASK) return desc_reusable; - if (state_val & DESC_COMMITTED_MASK) + if (state_val & DESC_COMMIT_MASK) return desc_committed; return desc_reserved; @@ -462,7 +462,7 @@ static enum desc_state desc_read(struct prb_desc_ring *desc_ring, static void desc_make_reusable(struct prb_desc_ring *desc_ring, unsigned long id) { - unsigned long val_committed = id | DESC_COMMITTED_MASK; + unsigned long val_committed = id | DESC_COMMIT_MASK; unsigned long val_reusable = val_committed | DESC_REUSE_MASK; struct prb_desc *desc = to_desc(desc_ring, id); atomic_long_t *state_var = &desc->state_var; @@ -899,7 +899,7 @@ static bool desc_reserve(struct printk_ringbuffer *rb, unsigned long *id_out) */ prev_state_val = atomic_long_read(&desc->state_var); /* LMM(desc_reserve:E) */ if (prev_state_val && - prev_state_val != (id_prev_wrap | DESC_COMMITTED_MASK | DESC_REUSE_MASK)) { + prev_state_val != (id_prev_wrap | DESC_COMMIT_MASK | DESC_REUSE_MASK)) { WARN_ON_ONCE(1); return false; } @@ -1184,7 +1184,7 @@ void prb_commit(struct prb_reserved_entry *e) * this. This pairs with desc_read:B. */ if (!atomic_long_try_cmpxchg(&d->state_var, &prev_state_val, - e->id | DESC_COMMITTED_MASK)) { /* LMM(prb_commit:B) */ + e->id | DESC_COMMIT_MASK)) { /* LMM(prb_commit:B) */ WARN_ON_ONCE(1); } diff --git a/kernel/printk/printk_ringbuffer.h b/kernel/printk/printk_ringbuffer.h index e6302da041f9..dcda5e9b4676 100644 --- a/kernel/printk/printk_ringbuffer.h +++ b/kernel/printk/printk_ringbuffer.h @@ -115,9 +115,9 @@ struct prb_reserved_entry { #define _DATA_SIZE(sz_bits) (1UL << (sz_bits)) #define _DESCS_COUNT(ct_bits) (1U << (ct_bits)) #define DESC_SV_BITS (sizeof(unsigned long) * 8) -#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1)) +#define DESC_COMMIT_MASK (1UL << (DESC_SV_BITS - 1)) #define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2)) -#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK) +#define DESC_FLAGS_MASK (DESC_COMMIT_MASK | DESC_REUSE_MASK) #define DESC_ID_MASK (~DESC_FLAGS_MASK) #define DESC_ID(sv) ((sv) & DESC_ID_MASK) #define FAILED_LPOS 0x1 @@ -213,7 +213,7 @@ struct prb_reserved_entry { */ #define BLK0_LPOS(sz_bits) (-(_DATA_SIZE(sz_bits))) #define DESC0_ID(ct_bits) DESC_ID(-(_DESCS_COUNT(ct_bits) + 1)) -#define DESC0_SV(ct_bits) (DESC_COMMITTED_MASK | DESC_REUSE_MASK | DESC0_ID(ct_bits)) +#define DESC0_SV(ct_bits) (DESC_COMMIT_MASK | DESC_REUSE_MASK | DESC0_ID(ct_bits)) /* * Define a ringbuffer with an external text data buffer. The same as -- 2.20.1
