2020-04-15 23:11:01

by Zhiqiang Liu

Subject: [PATCH] md/persistent-data: exit_ro_spine func return void

From: Zhiqiang Liu <[email protected]>

In commit 4c7da06f5a78 ("dm persistent data: eliminate unnecessary return values"),
r value in exit_ro_spine will not changes, so exit_ro_spine donot need
to return values.

Signed-off-by: Zhiqiang Liu <[email protected]>
---
drivers/md/persistent-data/dm-btree-internal.h | 2 +-
drivers/md/persistent-data/dm-btree-spine.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
index a240990a7f33..55a4096f1334 100644
--- a/drivers/md/persistent-data/dm-btree-internal.h
+++ b/drivers/md/persistent-data/dm-btree-internal.h
@@ -68,7 +68,7 @@ struct ro_spine {
};

void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info);
-int exit_ro_spine(struct ro_spine *s);
+void exit_ro_spine(struct ro_spine *s);
int ro_step(struct ro_spine *s, dm_block_t new_child);
void ro_pop(struct ro_spine *s);
struct btree_node *ro_node(struct ro_spine *s);
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
index b27b8091a1ca..e03cb9e48773 100644
--- a/drivers/md/persistent-data/dm-btree-spine.c
+++ b/drivers/md/persistent-data/dm-btree-spine.c
@@ -132,15 +132,13 @@ void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info)
s->nodes[1] = NULL;
}

-int exit_ro_spine(struct ro_spine *s)
+void exit_ro_spine(struct ro_spine *s)
{
- int r = 0, i;
+ int i;

for (i = 0; i < s->count; i++) {
unlock_block(s->info, s->nodes[i]);
}
-
- return r;
}

int ro_step(struct ro_spine *s, dm_block_t new_child)
--
2.19.1

2020-04-21 01:13:04

by Zhiqiang Liu

Subject: Re: [PATCH] md/persistent-data: exit_ro_spine func return void

Friendly ping..

On 2020/4/15 19:57, Zhiqiang Liu wrote:
> From: Zhiqiang Liu <[email protected]>
>
> In commit 4c7da06f5a78 ("dm persistent data: eliminate unnecessary return values"),
> r value in exit_ro_spine will not changes, so exit_ro_spine donot need
> to return values.
>
> Signed-off-by: Zhiqiang Liu <[email protected]>
> ---
> drivers/md/persistent-data/dm-btree-internal.h | 2 +-
> drivers/md/persistent-data/dm-btree-spine.c | 6 ++----
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
> index a240990a7f33..55a4096f1334 100644
> --- a/drivers/md/persistent-data/dm-btree-internal.h
> +++ b/drivers/md/persistent-data/dm-btree-internal.h
> @@ -68,7 +68,7 @@ struct ro_spine {
> };
>
> void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info);
> -int exit_ro_spine(struct ro_spine *s);
> +void exit_ro_spine(struct ro_spine *s);
> int ro_step(struct ro_spine *s, dm_block_t new_child);
> void ro_pop(struct ro_spine *s);
> struct btree_node *ro_node(struct ro_spine *s);
> diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
> index b27b8091a1ca..e03cb9e48773 100644
> --- a/drivers/md/persistent-data/dm-btree-spine.c
> +++ b/drivers/md/persistent-data/dm-btree-spine.c
> @@ -132,15 +132,13 @@ void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info)
> s->nodes[1] = NULL;
> }
>
> -int exit_ro_spine(struct ro_spine *s)
> +void exit_ro_spine(struct ro_spine *s)
> {
> - int r = 0, i;
> + int i;
>
> for (i = 0; i < s->count; i++) {
> unlock_block(s->info, s->nodes[i]);
> }
> -
> - return r;
> }
>
> int ro_step(struct ro_spine *s, dm_block_t new_child)
>