2020-11-10 12:51:59

by Nikolay Borisov

Subject: [PATCH] printk: ringbuffer: Convert function argument to local variable

data_alloc's 2nd argument is always rb::text_data_ring and that functino
always takes a struct printk_ringbuffer. Instead of passing the data
ring buffer as an argument simply make it a local variable.

Signed-off-by: Nikolay Borisov <[email protected]>
---
kernel/printk/printk_ringbuffer.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c
index 6b1525685277..7f2713e1bbcc 100644
--- a/kernel/printk/printk_ringbuffer.c
+++ b/kernel/printk/printk_ringbuffer.c
@@ -1021,10 +1021,10 @@ static unsigned long get_next_lpos(struct prb_data_ring *data_ring,
* if necessary. This function also associates the data block with
* a specified descriptor.
*/
-static char *data_alloc(struct printk_ringbuffer *rb,
- struct prb_data_ring *data_ring, unsigned int size,
+static char *data_alloc(struct printk_ringbuffer *rb, unsigned int size,
struct prb_data_blk_lpos *blk_lpos, unsigned long id)
{
+ struct prb_data_ring *data_ring = &rb->text_data_ring;
struct prb_data_block *blk;
unsigned long begin_lpos;
unsigned long next_lpos;
@@ -1397,7 +1397,7 @@ bool prb_reserve_in_last(struct prb_reserved_entry *e, struct printk_ringbuffer
if (r->text_buf_size > max_size)
goto fail;

- r->text_buf = data_alloc(rb, &rb->text_data_ring, r->text_buf_size,
+ r->text_buf = data_alloc(rb, r->text_buf_size,
&d->text_blk_lpos, id);
} else {
if (!get_data(&rb->text_data_ring, &d->text_blk_lpos, &data_size))
@@ -1549,8 +1549,7 @@ bool prb_reserve(struct prb_reserved_entry *e, struct printk_ringbuffer *rb,
if (info->seq > 0)
desc_make_final(desc_ring, DESC_ID(id - 1));

- r->text_buf = data_alloc(rb, &rb->text_data_ring, r->text_buf_size,
- &d->text_blk_lpos, id);
+ r->text_buf = data_alloc(rb, r->text_buf_size, &d->text_blk_lpos, id);
/* If text data allocation fails, a data-less record is committed. */
if (r->text_buf_size && !r->text_buf) {
prb_commit(e);
--
2.25.1

2020-11-10 13:16:37

by John Ogness

Subject: Re: [PATCH] printk: ringbuffer: Convert function argument to local variable

On 2020-11-10, Nikolay Borisov <[email protected]> wrote:
> data_alloc's 2nd argument is always rb::text_data_ring and that functino
> always takes a struct printk_ringbuffer. Instead of passing the data
> ring buffer as an argument simply make it a local variable.

This is a relic of when we had a second data ring (for
dictionaries). The patch is a nice cleanup, but there are actually
several functions that could use this exact same cleanup:

- data_make_reusable()
- data_push_tail()
- data_alloc()
- data_realloc()

Perhaps we should fix them all in a single patch?

John Ogness

2020-11-10 13:23:51

by Nikolay Borisov

Subject: Re: [PATCH] printk: ringbuffer: Convert function argument to local variable

On 10.11.20 г. 15:14 ч., John Ogness wrote:
> On 2020-11-10, Nikolay Borisov <[email protected]> wrote:
>> data_alloc's 2nd argument is always rb::text_data_ring and that functino
>> always takes a struct printk_ringbuffer. Instead of passing the data
>> ring buffer as an argument simply make it a local variable.
>
> This is a relic of when we had a second data ring (for
> dictionaries). The patch is a nice cleanup, but there are actually
> several functions that could use this exact same cleanup:
>
> - data_make_reusable()
> - data_push_tail()
> - data_alloc()
> - data_realloc()
>
> Perhaps we should fix them all in a single patch?

I observed that right after sending this patch, so I have authored the
necessary changes I can squash them and send them.

>
> John Ogness
>