2019-07-25 14:06:57

by Weitao Hou

Subject: [PATCH] ext4: use rb_entry_safe() instead of open-coding it

use rb_entry_safe() to make it clean

Signed-off-by: Weitao Hou <[email protected]>
---
fs/ext4/extents_status.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 7521de2dcf3a..08ce5ded3538 100644
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -228,8 +228,7 @@ static struct extent_status *__es_tree_search(struct rb_root *root,

if (es && lblk > ext4_es_end(es)) {
node = rb_next(&es->rb_node);
- return node ? rb_entry(node, struct extent_status, rb_node) :
- NULL;
+ return rb_entry_safe(node, struct extent_status, rb_node);
}

return NULL;
--
2.18.0

2019-08-02 13:53:11

by Jan Kara

Subject: Re: [PATCH] ext4: use rb_entry_safe() instead of open-coding it

On Thu 25-07-19 21:16:58, Weitao Hou wrote:
> use rb_entry_safe() to make it clean
>
> Signed-off-by: Weitao Hou <[email protected]>

Thanks for the patch. It looks good. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/ext4/extents_status.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
> index 7521de2dcf3a..08ce5ded3538 100644
> --- a/fs/ext4/extents_status.c
> +++ b/fs/ext4/extents_status.c
> @@ -228,8 +228,7 @@ static struct extent_status *__es_tree_search(struct rb_root *root,
>
> if (es && lblk > ext4_es_end(es)) {
> node = rb_next(&es->rb_node);
> - return node ? rb_entry(node, struct extent_status, rb_node) :
> - NULL;
> + return rb_entry_safe(node, struct extent_status, rb_node);
> }
>
> return NULL;
> --
> 2.18.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR