| Message ID | 1636112380-11040-1-git-send-email-zhenggy@chinatelecom.cn |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | ipvs: remove unused variable for ip_vs_new_dest | expand |
Hello, On Fri, 5 Nov 2021, GuoYong Zheng wrote: > The dest variable is not used after ip_vs_new_dest anymore in > ip_vs_add_dest, do not need pass it to ip_vs_new_dest, remove it. > > Signed-off-by: GuoYong Zheng <zhenggy@chinatelecom.cn> Looks good to me for -next, thanks! Acked-by: Julian Anastasov <ja@ssi.bg> > --- > net/netfilter/ipvs/ip_vs_ctl.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c > index e62b40b..494399d 100644 > --- a/net/netfilter/ipvs/ip_vs_ctl.c > +++ b/net/netfilter/ipvs/ip_vs_ctl.c > @@ -959,8 +959,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > * Create a destination for the given service > */ > static int > -ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, > - struct ip_vs_dest **dest_p) > +ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) > { > struct ip_vs_dest *dest; > unsigned int atype, i; > @@ -1020,8 +1019,6 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > spin_lock_init(&dest->stats.lock); > __ip_vs_update_dest(svc, dest, udest, 1); > > - *dest_p = dest; > - > LeaveFunction(2); > return 0; > > @@ -1095,7 +1092,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > /* > * Allocate and initialize the dest structure > */ > - ret = ip_vs_new_dest(svc, udest, &dest); > + ret = ip_vs_new_dest(svc, udest); > } > LeaveFunction(2); > > -- > 1.8.3.1 Regards -- Julian Anastasov <ja@ssi.bg>
On Sat, Nov 13, 2021 at 11:56:36AM +0200, Julian Anastasov wrote: > > Hello, > > On Fri, 5 Nov 2021, GuoYong Zheng wrote: > > > The dest variable is not used after ip_vs_new_dest anymore in > > ip_vs_add_dest, do not need pass it to ip_vs_new_dest, remove it. > > > > Signed-off-by: GuoYong Zheng <zhenggy@chinatelecom.cn> > > Looks good to me for -next, thanks! > > Acked-by: Julian Anastasov <ja@ssi.bg> Thanks GuoYong, Acked-by: Simon Horman <horms@verge.net.au> Pablo, please consider this for nf-next at your convenience. > > > --- > > net/netfilter/ipvs/ip_vs_ctl.c | 7 ++----- > > 1 file changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c > > index e62b40b..494399d 100644 > > --- a/net/netfilter/ipvs/ip_vs_ctl.c > > +++ b/net/netfilter/ipvs/ip_vs_ctl.c > > @@ -959,8 +959,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > > * Create a destination for the given service > > */ > > static int > > -ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, > > - struct ip_vs_dest **dest_p) > > +ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) > > { > > struct ip_vs_dest *dest; > > unsigned int atype, i; > > @@ -1020,8 +1019,6 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > > spin_lock_init(&dest->stats.lock); > > __ip_vs_update_dest(svc, dest, udest, 1); > > > > - *dest_p = dest; > > - > > LeaveFunction(2); > > return 0; > > > > @@ -1095,7 +1092,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) > > /* > > * Allocate and initialize the dest structure > > */ > > - ret = ip_vs_new_dest(svc, udest, &dest); > > + ret = ip_vs_new_dest(svc, udest); > > } > > LeaveFunction(2); > > > > -- > > 1.8.3.1 > > Regards > > -- > Julian Anastasov <ja@ssi.bg> >
Thanks for review. 在 2021/11/15 2:02, Simon Horman 写道: > On Sat, Nov 13, 2021 at 11:56:36AM +0200, Julian Anastasov wrote: >> >> Hello, >> >> On Fri, 5 Nov 2021, GuoYong Zheng wrote: >> >>> The dest variable is not used after ip_vs_new_dest anymore in >>> ip_vs_add_dest, do not need pass it to ip_vs_new_dest, remove it. >>> >>> Signed-off-by: GuoYong Zheng <zhenggy@chinatelecom.cn> >> >> Looks good to me for -next, thanks! >> >> Acked-by: Julian Anastasov <ja@ssi.bg> > > Thanks GuoYong, > > Acked-by: Simon Horman <horms@verge.net.au> > > Pablo, please consider this for nf-next at your convenience. > >> >>> --- >>> net/netfilter/ipvs/ip_vs_ctl.c | 7 ++----- >>> 1 file changed, 2 insertions(+), 5 deletions(-) >>> >>> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c >>> index e62b40b..494399d 100644 >>> --- a/net/netfilter/ipvs/ip_vs_ctl.c >>> +++ b/net/netfilter/ipvs/ip_vs_ctl.c >>> @@ -959,8 +959,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) >>> * Create a destination for the given service >>> */ >>> static int >>> -ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, >>> - struct ip_vs_dest **dest_p) >>> +ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) >>> { >>> struct ip_vs_dest *dest; >>> unsigned int atype, i; >>> @@ -1020,8 +1019,6 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) >>> spin_lock_init(&dest->stats.lock); >>> __ip_vs_update_dest(svc, dest, udest, 1); >>> >>> - *dest_p = dest; >>> - >>> LeaveFunction(2); >>> return 0; >>> >>> @@ -1095,7 +1092,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) >>> /* >>> * Allocate and initialize the dest structure >>> */ >>> - ret = ip_vs_new_dest(svc, udest, &dest); >>> + ret = ip_vs_new_dest(svc, udest); >>> } >>> LeaveFunction(2); >>> >>> -- >>> 1.8.3.1 >> >> Regards >> >> -- >> Julian Anastasov <ja@ssi.bg> >>
On Sun, Nov 14, 2021 at 07:02:06PM +0100, Simon Horman wrote: > On Sat, Nov 13, 2021 at 11:56:36AM +0200, Julian Anastasov wrote: > > > > Hello, > > > > On Fri, 5 Nov 2021, GuoYong Zheng wrote: > > > > > The dest variable is not used after ip_vs_new_dest anymore in > > > ip_vs_add_dest, do not need pass it to ip_vs_new_dest, remove it. > > > > > > Signed-off-by: GuoYong Zheng <zhenggy@chinatelecom.cn> > > > > Looks good to me for -next, thanks! > > > > Acked-by: Julian Anastasov <ja@ssi.bg> > > Thanks GuoYong, > > Acked-by: Simon Horman <horms@verge.net.au> > > Pablo, please consider this for nf-next at your convenience. Applied to nf-next, thanks
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index e62b40b..494399d 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -959,8 +959,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) * Create a destination for the given service */ static int -ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, - struct ip_vs_dest **dest_p) +ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) { struct ip_vs_dest *dest; unsigned int atype, i; @@ -1020,8 +1019,6 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) spin_lock_init(&dest->stats.lock); __ip_vs_update_dest(svc, dest, udest, 1); - *dest_p = dest; - LeaveFunction(2); return 0; @@ -1095,7 +1092,7 @@ static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs) /* * Allocate and initialize the dest structure */ - ret = ip_vs_new_dest(svc, udest, &dest); + ret = ip_vs_new_dest(svc, udest); } LeaveFunction(2);
The dest variable is not used after ip_vs_new_dest anymore in ip_vs_add_dest, do not need pass it to ip_vs_new_dest, remove it. Signed-off-by: GuoYong Zheng <zhenggy@chinatelecom.cn> --- net/netfilter/ipvs/ip_vs_ctl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)