2021-10-28 01:04:23

by CGEL

Subject: [PATCH] raid5-ppl: use swap() to make code cleaner

Using swap() make it more readable.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Yang Guang <[email protected]>
---
drivers/md/raid5-ppl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index 3ddc2aa0b530..4ab417915d7f 100644
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -1081,7 +1081,7 @@ static int ppl_load_distributed(struct ppl_log *log)
struct ppl_conf *ppl_conf = log->ppl_conf;
struct md_rdev *rdev = log->rdev;
struct mddev *mddev = rdev->mddev;
- struct page *page, *page2, *tmp;
+ struct page *page, *page2;
struct ppl_header *pplhdr = NULL, *prev_pplhdr = NULL;
u32 crc, crc_stored;
u32 signature;
@@ -1156,9 +1156,7 @@ static int ppl_load_distributed(struct ppl_log *log)
prev_pplhdr_offset = pplhdr_offset;
prev_pplhdr = pplhdr;

- tmp = page;
- page = page2;
- page2 = tmp;
+ swap(page, page2);

/* calculate next potential ppl offset */
for (i = 0; i < le32_to_cpu(pplhdr->entries_count); i++)
--
2.30.2

2021-10-28 06:35:18

by Paul Menzel

Subject: Re: [PATCH] raid5-ppl: use swap() to make code cleaner

Dear Yang,


Thank you for the patch.

On 28.10.21 03:00, Yang Guang wrote:
> Using swap() make it more readable.

make*s*

Maybe:

Use the macro `swap()` defined in `include/linux/minmax.h` to avoid
opencoding it.

By the way, there is also the Coccinelle script
`scripts/coccinelle/misc/swap.cocci`.

> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Yang Guang <[email protected]>
> ---
> drivers/md/raid5-ppl.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
> index 3ddc2aa0b530..4ab417915d7f 100644
> --- a/drivers/md/raid5-ppl.c
> +++ b/drivers/md/raid5-ppl.c
> @@ -1081,7 +1081,7 @@ static int ppl_load_distributed(struct ppl_log *log)
> struct ppl_conf *ppl_conf = log->ppl_conf;
> struct md_rdev *rdev = log->rdev;
> struct mddev *mddev = rdev->mddev;
> - struct page *page, *page2, *tmp;
> + struct page *page, *page2;
> struct ppl_header *pplhdr = NULL, *prev_pplhdr = NULL;
> u32 crc, crc_stored;
> u32 signature;
> @@ -1156,9 +1156,7 @@ static int ppl_load_distributed(struct ppl_log *log)
> prev_pplhdr_offset = pplhdr_offset;
> prev_pplhdr = pplhdr;
>
> - tmp = page;
> - page = page2;
> - page2 = tmp;
> + swap(page, page2);
>
> /* calculate next potential ppl offset */
> for (i = 0; i < le32_to_cpu(pplhdr->entries_count); i++)
>


Kind regards,

Paul