nexthop: simplify code in nh_valid_get_bucket_req

[PATCH -next] nexthop: simplify code in nh_valid_get_bucket_req

Posted by williamsukatube@163.com 3 years, 6 months ago

From: William Dean <williamsukatube@163.com>

It could directly return 'nh_valid_get_bucket_req_res_bucket' to simplify code.

Signed-off-by: William Dean <williamsukatube@163.com>
---
 net/ipv4/nexthop.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
index 853a75a8fbaf..1556961cf153 100644
--- a/net/ipv4/nexthop.c
+++ b/net/ipv4/nexthop.c
@@ -3489,12 +3489,8 @@ static int nh_valid_get_bucket_req(const struct nlmsghdr *nlh,
 		return -EINVAL;
 	}

-	err = nh_valid_get_bucket_req_res_bucket(tb[NHA_RES_BUCKET],
+	return nh_valid_get_bucket_req_res_bucket(tb[NHA_RES_BUCKET],
 						 bucket_index, extack);
-	if (err)
-		return err;
-
-	return 0;
 }

 /* rtnl */
--
2.25.1

Re: [PATCH -next] nexthop: simplify code in nh_valid_get_bucket_req

Posted by David Ahern 3 years, 6 months ago

On 9/17/22 12:30 AM, williamsukatube@163.com wrote:
> From: William Dean <williamsukatube@163.com>
> 
> It could directly return 'nh_valid_get_bucket_req_res_bucket' to simplify code.
> 
> Signed-off-by: William Dean <williamsukatube@163.com>
> ---
>  net/ipv4/nexthop.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 

Reviewed-by: David Ahern <dsahern@kernel.org>

Re: [PATCH -next] nexthop: simplify code in nh_valid_get_bucket_req

Posted by Christophe JAILLET 3 years, 6 months ago

Le 17/09/2022 à 08:30, williamsukatube@163.com a écrit :
> From: William Dean <williamsukatube@163.com>
> 
> It could directly return 'nh_valid_get_bucket_req_res_bucket' to simplify code.
> 
> Signed-off-by: William Dean <williamsukatube@163.com>
> ---
>   net/ipv4/nexthop.c | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
> index 853a75a8fbaf..1556961cf153 100644
> --- a/net/ipv4/nexthop.c
> +++ b/net/ipv4/nexthop.c
> @@ -3489,12 +3489,8 @@ static int nh_valid_get_bucket_req(const struct nlmsghdr *nlh,
>   		return -EINVAL;
>   	}
> 
> -	err = nh_valid_get_bucket_req_res_bucket(tb[NHA_RES_BUCKET],
> +	return nh_valid_get_bucket_req_res_bucket(tb[NHA_RES_BUCKET],
>   						 bucket_index, extack);

Nit: there should be 1 additional space to keep alignment.

CJ

> -	if (err)
> -		return err;
> -
> -	return 0;
>   }
> 
>   /* rtnl */