linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ipvs: remove unnecessary space
@ 2019-07-10  7:45 yangxingwu
  2019-07-10  8:06 ` Simon Horman
  0 siblings, 1 reply; 14+ messages in thread
From: yangxingwu @ 2019-07-10  7:45 UTC (permalink / raw)
  To: wensong
  Cc: horms, ja, pablo, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, yangxingwu

this patch removes the extra space.

Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
---
 net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
index 94d9d34..98e358e 100644
--- a/net/netfilter/ipvs/ip_vs_mh.c
+++ b/net/netfilter/ipvs/ip_vs_mh.c
@@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
 		return 0;
 	}
 
-	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
-			 sizeof(unsigned long), GFP_KERNEL);
+	table =	kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
+			sizeof(unsigned long), GFP_KERNEL);
 	if (!table)
 		return -ENOMEM;
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-10  7:45 [PATCH] ipvs: remove unnecessary space yangxingwu
@ 2019-07-10  8:06 ` Simon Horman
  2019-07-11  0:22   ` Joe Perches
  2019-07-15  8:27   ` Pablo Neira Ayuso
  0 siblings, 2 replies; 14+ messages in thread
From: Simon Horman @ 2019-07-10  8:06 UTC (permalink / raw)
  To: yangxingwu, Pablo Neira Ayuso
  Cc: wensong, ja, pablo, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel

On Wed, Jul 10, 2019 at 03:45:52PM +0800, yangxingwu wrote:
> this patch removes the extra space.
> 
> Signed-off-by: yangxingwu <xingwu.yang@gmail.com>

Thanks, this looks good to me.

Acked-by: Simon Horman <horms@verge.net.au>

Pablo, please consider including this in nf-next.


> ---
>  net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index 94d9d34..98e358e 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
>  		return 0;
>  	}
>  
> -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> -			 sizeof(unsigned long), GFP_KERNEL);
> +	table =	kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> +			sizeof(unsigned long), GFP_KERNEL);
>  	if (!table)
>  		return -ENOMEM;
>  
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-10  8:06 ` Simon Horman
@ 2019-07-11  0:22   ` Joe Perches
  2019-07-12 13:07     ` yangxingwu
  2019-07-15  8:27   ` Pablo Neira Ayuso
  1 sibling, 1 reply; 14+ messages in thread
From: Joe Perches @ 2019-07-11  0:22 UTC (permalink / raw)
  To: Simon Horman, yangxingwu, Pablo Neira Ayuso
  Cc: wensong, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel

On Wed, 2019-07-10 at 10:06 +0200, Simon Horman wrote:
> On Wed, Jul 10, 2019 at 03:45:52PM +0800, yangxingwu wrote:
> > this patch removes the extra space.
> > 
> > Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> 
> Thanks, this looks good to me.
> 
> Acked-by: Simon Horman <horms@verge.net.au>
> 
> Pablo, please consider including this in nf-next.
> 
> 
> > ---
> >  net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > index 94d9d34..98e358e 100644
> > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> >  		return 0;
> >  	}
> >  
> > -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > -			 sizeof(unsigned long), GFP_KERNEL);
> > +	table =	kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > +			sizeof(unsigned long), GFP_KERNEL);

bitmap_alloc?

> >  	if (!table)
> >  		return -ENOMEM;
> >  
> > -- 
> > 1.8.3.1
> > 


^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH] ipvs: remove unnecessary space
  2019-07-11  0:22   ` Joe Perches
@ 2019-07-12 13:07     ` yangxingwu
  2019-07-15  7:57       ` Pablo Neira Ayuso
  0 siblings, 1 reply; 14+ messages in thread
From: yangxingwu @ 2019-07-12 13:07 UTC (permalink / raw)
  To: wensong
  Cc: horms, ja, pablo, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe, yangxingwu

this patch removes the extra space and use bitmap_zalloc instead

Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
---
 net/netfilter/ipvs/ip_vs_mh.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
index 94d9d34..3229867 100644
--- a/net/netfilter/ipvs/ip_vs_mh.c
+++ b/net/netfilter/ipvs/ip_vs_mh.c
@@ -174,8 +174,7 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
 		return 0;
 	}
 
-	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
-			 sizeof(unsigned long), GFP_KERNEL);
+	table = bitmap_zalloc(IP_VS_MH_TAB_SIZE, GFP_KERNEL);
 	if (!table)
 		return -ENOMEM;
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-12 13:07     ` yangxingwu
@ 2019-07-15  7:57       ` Pablo Neira Ayuso
  2019-07-15  8:26         ` Pablo Neira Ayuso
  0 siblings, 1 reply; 14+ messages in thread
From: Pablo Neira Ayuso @ 2019-07-15  7:57 UTC (permalink / raw)
  To: yangxingwu
  Cc: wensong, horms, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe

On Fri, Jul 12, 2019 at 09:07:21PM +0800, yangxingwu wrote:
> this patch removes the extra space and use bitmap_zalloc instead
> 
> Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> ---
>  net/netfilter/ipvs/ip_vs_mh.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index 94d9d34..3229867 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -174,8 +174,7 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
>  		return 0;
>  	}
>  
> -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> -			 sizeof(unsigned long), GFP_KERNEL);
> +	table = bitmap_zalloc(IP_VS_MH_TAB_SIZE, GFP_KERNEL);

By doing:

        git grep "=  " ...

on the netfilter folders, I see more of these, it would be good if you
fix them at once or, probably, you want to use coccinelle for this.

Thanks.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-15  7:57       ` Pablo Neira Ayuso
@ 2019-07-15  8:26         ` Pablo Neira Ayuso
  0 siblings, 0 replies; 14+ messages in thread
From: Pablo Neira Ayuso @ 2019-07-15  8:26 UTC (permalink / raw)
  To: yangxingwu
  Cc: wensong, horms, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe

On Mon, Jul 15, 2019 at 09:57:03AM +0200, Pablo Neira Ayuso wrote:
> On Fri, Jul 12, 2019 at 09:07:21PM +0800, yangxingwu wrote:
> > this patch removes the extra space and use bitmap_zalloc instead
> > 
> > Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> > ---
> >  net/netfilter/ipvs/ip_vs_mh.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > index 94d9d34..3229867 100644
> > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > @@ -174,8 +174,7 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> >  		return 0;
> >  	}
> >  
> > -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > -			 sizeof(unsigned long), GFP_KERNEL);
> > +	table = bitmap_zalloc(IP_VS_MH_TAB_SIZE, GFP_KERNEL);
> 
> By doing:
> 
>         git grep "=  " ...
> 
> on the netfilter folders, I see more of these, it would be good if you
> fix them at once or, probably, you want to use coccinelle for this.

If patch subject is "remove unnecessary space" then just remove
unnecessary spaces in the patch, otherwise I suggest you rename this
to "ipvs: use bitmap_zalloc()" or such, since the space removal here
is irrelevant.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-10  8:06 ` Simon Horman
  2019-07-11  0:22   ` Joe Perches
@ 2019-07-15  8:27   ` Pablo Neira Ayuso
  2019-07-16  1:26     ` yangxingwu
                       ` (2 more replies)
  1 sibling, 3 replies; 14+ messages in thread
From: Pablo Neira Ayuso @ 2019-07-15  8:27 UTC (permalink / raw)
  To: Simon Horman
  Cc: yangxingwu, wensong, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel

On Wed, Jul 10, 2019 at 10:06:09AM +0200, Simon Horman wrote:
> On Wed, Jul 10, 2019 at 03:45:52PM +0800, yangxingwu wrote:
> > ---
> >  net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > index 94d9d34..98e358e 100644
> > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> >  		return 0;
> >  	}
> >  
> > -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > -			 sizeof(unsigned long), GFP_KERNEL);
> > +	table =	kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > +			sizeof(unsigned long), GFP_KERNEL);

May I ask one thing? :-)

Please, remove all unnecessary spaces in one go, search for:

        git grep "=  "

in the netfilter tree, and send a v2 for this one.

Thanks.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-15  8:27   ` Pablo Neira Ayuso
@ 2019-07-16  1:26     ` yangxingwu
  2019-07-16  2:13     ` [PATCH v2] net/netfilter: remove unnecessary spaces yangxingwu
  2019-07-16  2:18     ` [PATCH] ipvs: remove unnecessary space yangxingwu
  2 siblings, 0 replies; 14+ messages in thread
From: yangxingwu @ 2019-07-16  1:26 UTC (permalink / raw)
  To: Pablo Neira Ayuso
  Cc: Simon Horman, wensong, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel

ok

I will remove all unnecessary spaces and send the v2 patch

Thansk Pablo

Pablo Neira Ayuso <pablo@netfilter.org> 于2019年7月15日周一 下午4:27写道：
>
> On Wed, Jul 10, 2019 at 10:06:09AM +0200, Simon Horman wrote:
> > On Wed, Jul 10, 2019 at 03:45:52PM +0800, yangxingwu wrote:
> > > ---
> > >  net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > > index 94d9d34..98e358e 100644
> > > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > > @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> > >             return 0;
> > >     }
> > >
> > > -   table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > > -                    sizeof(unsigned long), GFP_KERNEL);
> > > +   table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > > +                   sizeof(unsigned long), GFP_KERNEL);
>
> May I ask one thing? :-)
>
> Please, remove all unnecessary spaces in one go, search for:
>
>         git grep "=  "
>
> in the netfilter tree, and send a v2 for this one.
>
> Thanks.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH v2] net/netfilter: remove unnecessary spaces
  2019-07-15  8:27   ` Pablo Neira Ayuso
  2019-07-16  1:26     ` yangxingwu
@ 2019-07-16  2:13     ` yangxingwu
  2019-07-18 18:26       ` Pablo Neira Ayuso
  2019-08-13 10:10       ` Pablo Neira Ayuso
  2019-07-16  2:18     ` [PATCH] ipvs: remove unnecessary space yangxingwu
  2 siblings, 2 replies; 14+ messages in thread
From: yangxingwu @ 2019-07-16  2:13 UTC (permalink / raw)
  To: pablo
  Cc: wensong, horms, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe, yangxingwu

this patch removes extra spaces

Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
---
 net/netfilter/ipset/ip_set_hash_gen.h  | 2 +-
 net/netfilter/ipset/ip_set_list_set.c  | 2 +-
 net/netfilter/ipvs/ip_vs_core.c        | 2 +-
 net/netfilter/ipvs/ip_vs_mh.c          | 4 ++--
 net/netfilter/ipvs/ip_vs_proto_tcp.c   | 2 +-
 net/netfilter/nf_conntrack_ftp.c       | 2 +-
 net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
 net/netfilter/nfnetlink_log.c          | 4 ++--
 net/netfilter/nfnetlink_queue.c        | 4 ++--
 net/netfilter/xt_IDLETIMER.c           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 10f6196..eb907d2 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -954,7 +954,7 @@ struct htype {
 		mtype_data_netmask(d, NCIDR_GET(h->nets[j].cidr[0]));
 #endif
 		key = HKEY(d, h->initval, t->htable_bits);
-		n =  rcu_dereference_bh(hbucket(t, key));
+		n = rcu_dereference_bh(hbucket(t, key));
 		if (!n)
 			continue;
 		for (i = 0; i < n->pos; i++) {
diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index 8ada318..5c2be76 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -289,7 +289,7 @@ struct list_set {
 	if (n &&
 	    !(SET_WITH_TIMEOUT(set) &&
 	      ip_set_timeout_expired(ext_timeout(n, set))))
-		n =  NULL;
+		n = NULL;
 
 	e = kzalloc(set->dsize, GFP_ATOMIC);
 	if (!e)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 7138556..6b3ae76 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -615,7 +615,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
 		unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET &&
 				      iph->protocol == IPPROTO_UDP) ?
 				      IP_VS_CONN_F_ONE_PACKET : 0;
-		union nf_inet_addr daddr =  { .all = { 0, 0, 0, 0 } };
+		union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } };
 
 		/* create a new connection entry */
 		IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
index 94d9d34..da0280c 100644
--- a/net/netfilter/ipvs/ip_vs_mh.c
+++ b/net/netfilter/ipvs/ip_vs_mh.c
@@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
 		return 0;
 	}
 
-	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
-			 sizeof(unsigned long), GFP_KERNEL);
+	table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
+			sizeof(unsigned long), GFP_KERNEL);
 	if (!table)
 		return -ENOMEM;
 
diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
index 915ac82..c7b46a9 100644
--- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
@@ -710,7 +710,7 @@ static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd
 							sizeof(tcp_timeouts));
 	if (!pd->timeout_table)
 		return -ENOMEM;
-	pd->tcp_state_table =  tcp_states;
+	pd->tcp_state_table = tcp_states;
 	return 0;
 }
 
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 8c6c11b..26c1ff8 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -162,7 +162,7 @@ static int try_rfc959(const char *data, size_t dlen,
 	if (length == 0)
 		return 0;
 
-	cmd->u3.ip =  htonl((array[0] << 24) | (array[1] << 16) |
+	cmd->u3.ip = htonl((array[0] << 24) | (array[1] << 16) |
 				    (array[2] << 8) | array[3]);
 	cmd->u.tcp.port = htons((array[4] << 8) | array[5]);
 	return length;
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 1e2cc83..48f3a67 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1225,7 +1225,7 @@ static int tcp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
 	[CTA_PROTOINFO_TCP_WSCALE_ORIGINAL] = { .type = NLA_U8 },
 	[CTA_PROTOINFO_TCP_WSCALE_REPLY]    = { .type = NLA_U8 },
 	[CTA_PROTOINFO_TCP_FLAGS_ORIGINAL]  = { .len = sizeof(struct nf_ct_tcp_flags) },
-	[CTA_PROTOINFO_TCP_FLAGS_REPLY]	    = { .len =  sizeof(struct nf_ct_tcp_flags) },
+	[CTA_PROTOINFO_TCP_FLAGS_REPLY]	    = { .len = sizeof(struct nf_ct_tcp_flags) },
 };
 
 #define TCP_NLATTR_SIZE	( \
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 6dee4f9..d69e186 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -651,7 +651,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
 	/* FIXME: do we want to make the size calculation conditional based on
 	 * what is actually present?  way more branches and checks, but more
 	 * memory efficient... */
-	size =    nlmsg_total_size(sizeof(struct nfgenmsg))
+	size = nlmsg_total_size(sizeof(struct nfgenmsg))
 		+ nla_total_size(sizeof(struct nfulnl_msg_packet_hdr))
 		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
 		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
@@ -668,7 +668,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
 		+ nla_total_size(sizeof(struct nfgenmsg));	/* NLMSG_DONE */
 
 	if (in && skb_mac_header_was_set(skb)) {
-		size +=   nla_total_size(skb->dev->hard_header_len)
+		size += nla_total_size(skb->dev->hard_header_len)
 			+ nla_total_size(sizeof(u_int16_t))	/* hwtype */
 			+ nla_total_size(sizeof(u_int16_t));	/* hwlen */
 	}
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 89750f7..a1ef6e3 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -394,7 +394,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
 	char *secdata = NULL;
 	u32 seclen = 0;
 
-	size =    nlmsg_total_size(sizeof(struct nfgenmsg))
+	size = nlmsg_total_size(sizeof(struct nfgenmsg))
 		+ nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
 		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
 		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
@@ -453,7 +453,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
 	}
 
 	if (queue->flags & NFQA_CFG_F_UID_GID) {
-		size +=  (nla_total_size(sizeof(u_int32_t))	/* uid */
+		size += (nla_total_size(sizeof(u_int32_t))	/* uid */
 			+ nla_total_size(sizeof(u_int32_t)));	/* gid */
 	}
 
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 9cec9ea..f56d3ed 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -283,7 +283,7 @@ static int __init idletimer_tg_init(void)
 
 	idletimer_tg_kobj = &idletimer_tg_device->kobj;
 
-	err =  xt_register_target(&idletimer_tg);
+	err = xt_register_target(&idletimer_tg);
 	if (err < 0) {
 		pr_debug("couldn't register xt target\n");
 		goto out_dev;
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH] ipvs: remove unnecessary space
  2019-07-15  8:27   ` Pablo Neira Ayuso
  2019-07-16  1:26     ` yangxingwu
  2019-07-16  2:13     ` [PATCH v2] net/netfilter: remove unnecessary spaces yangxingwu
@ 2019-07-16  2:18     ` yangxingwu
  2 siblings, 0 replies; 14+ messages in thread
From: yangxingwu @ 2019-07-16  2:18 UTC (permalink / raw)
  To: Pablo Neira Ayuso
  Cc: Simon Horman, wensong, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel

Pablo

v2 has been sent

I made the following changes:

1. remove all unnecessary spaces in one go
2. revert bitmap_alloc ( since it's irrelevant to this subject)
3. chenge subject to "net/netfiler:remove unnecessary space"

thanks

Pablo Neira Ayuso <pablo@netfilter.org> 于2019年7月15日周一 下午4:27写道：
>
> On Wed, Jul 10, 2019 at 10:06:09AM +0200, Simon Horman wrote:
> > On Wed, Jul 10, 2019 at 03:45:52PM +0800, yangxingwu wrote:
> > > ---
> > >  net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > > index 94d9d34..98e358e 100644
> > > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > > @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> > >             return 0;
> > >     }
> > >
> > > -   table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > > -                    sizeof(unsigned long), GFP_KERNEL);
> > > +   table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > > +                   sizeof(unsigned long), GFP_KERNEL);
>
> May I ask one thing? :-)
>
> Please, remove all unnecessary spaces in one go, search for:
>
>         git grep "=  "
>
> in the netfilter tree, and send a v2 for this one.
>
> Thanks.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2] net/netfilter: remove unnecessary spaces
  2019-07-16  2:13     ` [PATCH v2] net/netfilter: remove unnecessary spaces yangxingwu
@ 2019-07-18 18:26       ` Pablo Neira Ayuso
  2019-07-19  1:49         ` yangxingwu
  2019-08-13 10:10       ` Pablo Neira Ayuso
  1 sibling, 1 reply; 14+ messages in thread
From: Pablo Neira Ayuso @ 2019-07-18 18:26 UTC (permalink / raw)
  To: yangxingwu
  Cc: wensong, horms, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe

Looks good, but you will have to wait until net-next reopens:

http://vger.kernel.org/~davem/net-next.html

Will keep this in my patchwork until that happens.

Thanks.

On Tue, Jul 16, 2019 at 10:13:01AM +0800, yangxingwu wrote:
> this patch removes extra spaces
> 
> Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> ---
>  net/netfilter/ipset/ip_set_hash_gen.h  | 2 +-
>  net/netfilter/ipset/ip_set_list_set.c  | 2 +-
>  net/netfilter/ipvs/ip_vs_core.c        | 2 +-
>  net/netfilter/ipvs/ip_vs_mh.c          | 4 ++--
>  net/netfilter/ipvs/ip_vs_proto_tcp.c   | 2 +-
>  net/netfilter/nf_conntrack_ftp.c       | 2 +-
>  net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
>  net/netfilter/nfnetlink_log.c          | 4 ++--
>  net/netfilter/nfnetlink_queue.c        | 4 ++--
>  net/netfilter/xt_IDLETIMER.c           | 2 +-
>  10 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
> index 10f6196..eb907d2 100644
> --- a/net/netfilter/ipset/ip_set_hash_gen.h
> +++ b/net/netfilter/ipset/ip_set_hash_gen.h
> @@ -954,7 +954,7 @@ struct htype {
>  		mtype_data_netmask(d, NCIDR_GET(h->nets[j].cidr[0]));
>  #endif
>  		key = HKEY(d, h->initval, t->htable_bits);
> -		n =  rcu_dereference_bh(hbucket(t, key));
> +		n = rcu_dereference_bh(hbucket(t, key));
>  		if (!n)
>  			continue;
>  		for (i = 0; i < n->pos; i++) {
> diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
> index 8ada318..5c2be76 100644
> --- a/net/netfilter/ipset/ip_set_list_set.c
> +++ b/net/netfilter/ipset/ip_set_list_set.c
> @@ -289,7 +289,7 @@ struct list_set {
>  	if (n &&
>  	    !(SET_WITH_TIMEOUT(set) &&
>  	      ip_set_timeout_expired(ext_timeout(n, set))))
> -		n =  NULL;
> +		n = NULL;
>  
>  	e = kzalloc(set->dsize, GFP_ATOMIC);
>  	if (!e)
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 7138556..6b3ae76 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -615,7 +615,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
>  		unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET &&
>  				      iph->protocol == IPPROTO_UDP) ?
>  				      IP_VS_CONN_F_ONE_PACKET : 0;
> -		union nf_inet_addr daddr =  { .all = { 0, 0, 0, 0 } };
> +		union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } };
>  
>  		/* create a new connection entry */
>  		IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index 94d9d34..da0280c 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
>  		return 0;
>  	}
>  
> -	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> -			 sizeof(unsigned long), GFP_KERNEL);
> +	table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> +			sizeof(unsigned long), GFP_KERNEL);
>  	if (!table)
>  		return -ENOMEM;
>  
> diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> index 915ac82..c7b46a9 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> @@ -710,7 +710,7 @@ static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd
>  							sizeof(tcp_timeouts));
>  	if (!pd->timeout_table)
>  		return -ENOMEM;
> -	pd->tcp_state_table =  tcp_states;
> +	pd->tcp_state_table = tcp_states;
>  	return 0;
>  }
>  
> diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
> index 8c6c11b..26c1ff8 100644
> --- a/net/netfilter/nf_conntrack_ftp.c
> +++ b/net/netfilter/nf_conntrack_ftp.c
> @@ -162,7 +162,7 @@ static int try_rfc959(const char *data, size_t dlen,
>  	if (length == 0)
>  		return 0;
>  
> -	cmd->u3.ip =  htonl((array[0] << 24) | (array[1] << 16) |
> +	cmd->u3.ip = htonl((array[0] << 24) | (array[1] << 16) |
>  				    (array[2] << 8) | array[3]);
>  	cmd->u.tcp.port = htons((array[4] << 8) | array[5]);
>  	return length;
> diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
> index 1e2cc83..48f3a67 100644
> --- a/net/netfilter/nf_conntrack_proto_tcp.c
> +++ b/net/netfilter/nf_conntrack_proto_tcp.c
> @@ -1225,7 +1225,7 @@ static int tcp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
>  	[CTA_PROTOINFO_TCP_WSCALE_ORIGINAL] = { .type = NLA_U8 },
>  	[CTA_PROTOINFO_TCP_WSCALE_REPLY]    = { .type = NLA_U8 },
>  	[CTA_PROTOINFO_TCP_FLAGS_ORIGINAL]  = { .len = sizeof(struct nf_ct_tcp_flags) },
> -	[CTA_PROTOINFO_TCP_FLAGS_REPLY]	    = { .len =  sizeof(struct nf_ct_tcp_flags) },
> +	[CTA_PROTOINFO_TCP_FLAGS_REPLY]	    = { .len = sizeof(struct nf_ct_tcp_flags) },
>  };
>  
>  #define TCP_NLATTR_SIZE	( \
> diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
> index 6dee4f9..d69e186 100644
> --- a/net/netfilter/nfnetlink_log.c
> +++ b/net/netfilter/nfnetlink_log.c
> @@ -651,7 +651,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
>  	/* FIXME: do we want to make the size calculation conditional based on
>  	 * what is actually present?  way more branches and checks, but more
>  	 * memory efficient... */
> -	size =    nlmsg_total_size(sizeof(struct nfgenmsg))
> +	size = nlmsg_total_size(sizeof(struct nfgenmsg))
>  		+ nla_total_size(sizeof(struct nfulnl_msg_packet_hdr))
>  		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
>  		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
> @@ -668,7 +668,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
>  		+ nla_total_size(sizeof(struct nfgenmsg));	/* NLMSG_DONE */
>  
>  	if (in && skb_mac_header_was_set(skb)) {
> -		size +=   nla_total_size(skb->dev->hard_header_len)
> +		size += nla_total_size(skb->dev->hard_header_len)
>  			+ nla_total_size(sizeof(u_int16_t))	/* hwtype */
>  			+ nla_total_size(sizeof(u_int16_t));	/* hwlen */
>  	}
> diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> index 89750f7..a1ef6e3 100644
> --- a/net/netfilter/nfnetlink_queue.c
> +++ b/net/netfilter/nfnetlink_queue.c
> @@ -394,7 +394,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
>  	char *secdata = NULL;
>  	u32 seclen = 0;
>  
> -	size =    nlmsg_total_size(sizeof(struct nfgenmsg))
> +	size = nlmsg_total_size(sizeof(struct nfgenmsg))
>  		+ nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
>  		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
>  		+ nla_total_size(sizeof(u_int32_t))	/* ifindex */
> @@ -453,7 +453,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
>  	}
>  
>  	if (queue->flags & NFQA_CFG_F_UID_GID) {
> -		size +=  (nla_total_size(sizeof(u_int32_t))	/* uid */
> +		size += (nla_total_size(sizeof(u_int32_t))	/* uid */
>  			+ nla_total_size(sizeof(u_int32_t)));	/* gid */
>  	}
>  
> diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
> index 9cec9ea..f56d3ed 100644
> --- a/net/netfilter/xt_IDLETIMER.c
> +++ b/net/netfilter/xt_IDLETIMER.c
> @@ -283,7 +283,7 @@ static int __init idletimer_tg_init(void)
>  
>  	idletimer_tg_kobj = &idletimer_tg_device->kobj;
>  
> -	err =  xt_register_target(&idletimer_tg);
> +	err = xt_register_target(&idletimer_tg);
>  	if (err < 0) {
>  		pr_debug("couldn't register xt target\n");
>  		goto out_dev;
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2] net/netfilter: remove unnecessary spaces
  2019-07-18 18:26       ` Pablo Neira Ayuso
@ 2019-07-19  1:49         ` yangxingwu
  0 siblings, 0 replies; 14+ messages in thread
From: yangxingwu @ 2019-07-19  1:49 UTC (permalink / raw)
  To: Pablo Neira Ayuso
  Cc: wensong, Simon Horman, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, Joe Perches

Thansk Pablo

Pablo Neira Ayuso <pablo@netfilter.org> 于2019年7月19日周五 上午2:26写道：
>
> Looks good, but you will have to wait until net-next reopens:
>
> http://vger.kernel.org/~davem/net-next.html
>
> Will keep this in my patchwork until that happens.
>
> Thanks.
>
> On Tue, Jul 16, 2019 at 10:13:01AM +0800, yangxingwu wrote:
> > this patch removes extra spaces
> >
> > Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> > ---
> >  net/netfilter/ipset/ip_set_hash_gen.h  | 2 +-
> >  net/netfilter/ipset/ip_set_list_set.c  | 2 +-
> >  net/netfilter/ipvs/ip_vs_core.c        | 2 +-
> >  net/netfilter/ipvs/ip_vs_mh.c          | 4 ++--
> >  net/netfilter/ipvs/ip_vs_proto_tcp.c   | 2 +-
> >  net/netfilter/nf_conntrack_ftp.c       | 2 +-
> >  net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
> >  net/netfilter/nfnetlink_log.c          | 4 ++--
> >  net/netfilter/nfnetlink_queue.c        | 4 ++--
> >  net/netfilter/xt_IDLETIMER.c           | 2 +-
> >  10 files changed, 13 insertions(+), 13 deletions(-)
> >
> > diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
> > index 10f6196..eb907d2 100644
> > --- a/net/netfilter/ipset/ip_set_hash_gen.h
> > +++ b/net/netfilter/ipset/ip_set_hash_gen.h
> > @@ -954,7 +954,7 @@ struct htype {
> >               mtype_data_netmask(d, NCIDR_GET(h->nets[j].cidr[0]));
> >  #endif
> >               key = HKEY(d, h->initval, t->htable_bits);
> > -             n =  rcu_dereference_bh(hbucket(t, key));
> > +             n = rcu_dereference_bh(hbucket(t, key));
> >               if (!n)
> >                       continue;
> >               for (i = 0; i < n->pos; i++) {
> > diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
> > index 8ada318..5c2be76 100644
> > --- a/net/netfilter/ipset/ip_set_list_set.c
> > +++ b/net/netfilter/ipset/ip_set_list_set.c
> > @@ -289,7 +289,7 @@ struct list_set {
> >       if (n &&
> >           !(SET_WITH_TIMEOUT(set) &&
> >             ip_set_timeout_expired(ext_timeout(n, set))))
> > -             n =  NULL;
> > +             n = NULL;
> >
> >       e = kzalloc(set->dsize, GFP_ATOMIC);
> >       if (!e)
> > diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> > index 7138556..6b3ae76 100644
> > --- a/net/netfilter/ipvs/ip_vs_core.c
> > +++ b/net/netfilter/ipvs/ip_vs_core.c
> > @@ -615,7 +615,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
> >               unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET &&
> >                                     iph->protocol == IPPROTO_UDP) ?
> >                                     IP_VS_CONN_F_ONE_PACKET : 0;
> > -             union nf_inet_addr daddr =  { .all = { 0, 0, 0, 0 } };
> > +             union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } };
> >
> >               /* create a new connection entry */
> >               IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
> > diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> > index 94d9d34..da0280c 100644
> > --- a/net/netfilter/ipvs/ip_vs_mh.c
> > +++ b/net/netfilter/ipvs/ip_vs_mh.c
> > @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> >               return 0;
> >       }
> >
> > -     table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > -                      sizeof(unsigned long), GFP_KERNEL);
> > +     table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> > +                     sizeof(unsigned long), GFP_KERNEL);
> >       if (!table)
> >               return -ENOMEM;
> >
> > diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> > index 915ac82..c7b46a9 100644
> > --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
> > +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> > @@ -710,7 +710,7 @@ static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd
> >                                                       sizeof(tcp_timeouts));
> >       if (!pd->timeout_table)
> >               return -ENOMEM;
> > -     pd->tcp_state_table =  tcp_states;
> > +     pd->tcp_state_table = tcp_states;
> >       return 0;
> >  }
> >
> > diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
> > index 8c6c11b..26c1ff8 100644
> > --- a/net/netfilter/nf_conntrack_ftp.c
> > +++ b/net/netfilter/nf_conntrack_ftp.c
> > @@ -162,7 +162,7 @@ static int try_rfc959(const char *data, size_t dlen,
> >       if (length == 0)
> >               return 0;
> >
> > -     cmd->u3.ip =  htonl((array[0] << 24) | (array[1] << 16) |
> > +     cmd->u3.ip = htonl((array[0] << 24) | (array[1] << 16) |
> >                                   (array[2] << 8) | array[3]);
> >       cmd->u.tcp.port = htons((array[4] << 8) | array[5]);
> >       return length;
> > diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
> > index 1e2cc83..48f3a67 100644
> > --- a/net/netfilter/nf_conntrack_proto_tcp.c
> > +++ b/net/netfilter/nf_conntrack_proto_tcp.c
> > @@ -1225,7 +1225,7 @@ static int tcp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
> >       [CTA_PROTOINFO_TCP_WSCALE_ORIGINAL] = { .type = NLA_U8 },
> >       [CTA_PROTOINFO_TCP_WSCALE_REPLY]    = { .type = NLA_U8 },
> >       [CTA_PROTOINFO_TCP_FLAGS_ORIGINAL]  = { .len = sizeof(struct nf_ct_tcp_flags) },
> > -     [CTA_PROTOINFO_TCP_FLAGS_REPLY]     = { .len =  sizeof(struct nf_ct_tcp_flags) },
> > +     [CTA_PROTOINFO_TCP_FLAGS_REPLY]     = { .len = sizeof(struct nf_ct_tcp_flags) },
> >  };
> >
> >  #define TCP_NLATTR_SIZE      ( \
> > diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
> > index 6dee4f9..d69e186 100644
> > --- a/net/netfilter/nfnetlink_log.c
> > +++ b/net/netfilter/nfnetlink_log.c
> > @@ -651,7 +651,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
> >       /* FIXME: do we want to make the size calculation conditional based on
> >        * what is actually present?  way more branches and checks, but more
> >        * memory efficient... */
> > -     size =    nlmsg_total_size(sizeof(struct nfgenmsg))
> > +     size = nlmsg_total_size(sizeof(struct nfgenmsg))
> >               + nla_total_size(sizeof(struct nfulnl_msg_packet_hdr))
> >               + nla_total_size(sizeof(u_int32_t))     /* ifindex */
> >               + nla_total_size(sizeof(u_int32_t))     /* ifindex */
> > @@ -668,7 +668,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
> >               + nla_total_size(sizeof(struct nfgenmsg));      /* NLMSG_DONE */
> >
> >       if (in && skb_mac_header_was_set(skb)) {
> > -             size +=   nla_total_size(skb->dev->hard_header_len)
> > +             size += nla_total_size(skb->dev->hard_header_len)
> >                       + nla_total_size(sizeof(u_int16_t))     /* hwtype */
> >                       + nla_total_size(sizeof(u_int16_t));    /* hwlen */
> >       }
> > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> > index 89750f7..a1ef6e3 100644
> > --- a/net/netfilter/nfnetlink_queue.c
> > +++ b/net/netfilter/nfnetlink_queue.c
> > @@ -394,7 +394,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
> >       char *secdata = NULL;
> >       u32 seclen = 0;
> >
> > -     size =    nlmsg_total_size(sizeof(struct nfgenmsg))
> > +     size = nlmsg_total_size(sizeof(struct nfgenmsg))
> >               + nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
> >               + nla_total_size(sizeof(u_int32_t))     /* ifindex */
> >               + nla_total_size(sizeof(u_int32_t))     /* ifindex */
> > @@ -453,7 +453,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
> >       }
> >
> >       if (queue->flags & NFQA_CFG_F_UID_GID) {
> > -             size +=  (nla_total_size(sizeof(u_int32_t))     /* uid */
> > +             size += (nla_total_size(sizeof(u_int32_t))      /* uid */
> >                       + nla_total_size(sizeof(u_int32_t)));   /* gid */
> >       }
> >
> > diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
> > index 9cec9ea..f56d3ed 100644
> > --- a/net/netfilter/xt_IDLETIMER.c
> > +++ b/net/netfilter/xt_IDLETIMER.c
> > @@ -283,7 +283,7 @@ static int __init idletimer_tg_init(void)
> >
> >       idletimer_tg_kobj = &idletimer_tg_device->kobj;
> >
> > -     err =  xt_register_target(&idletimer_tg);
> > +     err = xt_register_target(&idletimer_tg);
> >       if (err < 0) {
> >               pr_debug("couldn't register xt target\n");
> >               goto out_dev;
> > --
> > 1.8.3.1
> >

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2] net/netfilter: remove unnecessary spaces
  2019-07-16  2:13     ` [PATCH v2] net/netfilter: remove unnecessary spaces yangxingwu
  2019-07-18 18:26       ` Pablo Neira Ayuso
@ 2019-08-13 10:10       ` Pablo Neira Ayuso
  1 sibling, 0 replies; 14+ messages in thread
From: Pablo Neira Ayuso @ 2019-08-13 10:10 UTC (permalink / raw)
  To: yangxingwu
  Cc: wensong, horms, ja, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, joe

Applied, thanks.

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH] ipvs: remove unnecessary space
@ 2019-07-11  3:39 yangxingwu
  0 siblings, 0 replies; 14+ messages in thread
From: yangxingwu @ 2019-07-11  3:39 UTC (permalink / raw)
  To: wensong
  Cc: horms, ja, pablo, kadlec, fw, davem, netdev, lvs-devel,
	netfilter-devel, coreteam, linux-kernel, yangxingwu

this patch removes the extra space and use bitmap_zalloc instead

Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
---
 net/netfilter/ipvs/ip_vs_mh.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
index 94d9d34..3229867 100644
--- a/net/netfilter/ipvs/ip_vs_mh.c
+++ b/net/netfilter/ipvs/ip_vs_mh.c
@@ -174,8 +174,7 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
 		return 0;
 	}
 
-	table =  kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
-			 sizeof(unsigned long), GFP_KERNEL);
+	table = bitmap_zalloc(IP_VS_MH_TAB_SIZE, GFP_KERNEL);
 	if (!table)
 		return -ENOMEM;
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-08-13 10:10 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-10  7:45 [PATCH] ipvs: remove unnecessary space yangxingwu
2019-07-10  8:06 ` Simon Horman
2019-07-11  0:22   ` Joe Perches
2019-07-12 13:07     ` yangxingwu
2019-07-15  7:57       ` Pablo Neira Ayuso
2019-07-15  8:26         ` Pablo Neira Ayuso
2019-07-15  8:27   ` Pablo Neira Ayuso
2019-07-16  1:26     ` yangxingwu
2019-07-16  2:13     ` [PATCH v2] net/netfilter: remove unnecessary spaces yangxingwu
2019-07-18 18:26       ` Pablo Neira Ayuso
2019-07-19  1:49         ` yangxingwu
2019-08-13 10:10       ` Pablo Neira Ayuso
2019-07-16  2:18     ` [PATCH] ipvs: remove unnecessary space yangxingwu
2019-07-11  3:39 yangxingwu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).