2017-03-21 13:23:25

by Simran Singhal

Subject: [PATCH 0/2] netfilter: ,[email protected]

This patch series Simplify function returns by merging
assignment and return into one command line.

simran singhal (2):
netfilter: ipset: Compress return logic
netfilter: ipvs: Compress return logic

net/netfilter/ipset/ip_set_list_set.c | 5 +----
net/netfilter/ipvs/ip_vs_ftp.c | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)

--
2.7.4

2017-03-21 13:23:45

by Simran Singhal

Subject: [PATCH 1/2] netfilter: ipset: Compress return logic

Simplify function returns by merging assignment and return into one
command line.

Signed-off-by: simran singhal <[email protected]>
---

--This is my contribution to the netfilter project of
Outreachy Round 14.

net/netfilter/ipset/ip_set_list_set.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index 178d4eb..2fff6b5 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -453,7 +453,6 @@ static size_t
list_set_memsize(const struct list_set *map, size_t dsize)
{
struct set_elem *e;
- size_t memsize;
u32 n = 0;

rcu_read_lock();
@@ -461,9 +460,7 @@ list_set_memsize(const struct list_set *map, size_t dsize)
n++;
rcu_read_unlock();

- memsize = sizeof(*map) + n * dsize;
-
- return memsize;
+ return (sizeof(*map) + n * dsize);
}

static int
--
2.7.4

2017-03-21 13:23:50

by Simran Singhal

Subject: [PATCH 2/2] netfilter: ipvs: Compress return logic

Simplify function returns by merging assignment and return into
one command line.

Signed-off-by: simran singhal <[email protected]>
---

--This is my contribution to the netfilter project of
Outreachy Round 14.

net/netfilter/ipvs/ip_vs_ftp.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index d30c327..c93c937 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -482,11 +482,8 @@ static struct pernet_operations ip_vs_ftp_ops = {

static int __init ip_vs_ftp_init(void)
{
- int rv;
-
- rv = register_pernet_subsys(&ip_vs_ftp_ops);
/* rcu_barrier() is called by netns on error */
- return rv;
+ return register_pernet_subsys(&ip_vs_ftp_ops);
}

/*
--
2.7.4

2017-03-21 15:50:12

by Sergei Shtylyov

Subject: Re: [PATCH 2/2] netfilter: ipvs: Compress return logic

Hello!

On 03/21/2017 04:23 PM, simran singhal wrote:

> Simplify function returns by merging assignment and return into
> one command line.

You mean "one statement"?

> Signed-off-by: simran singhal <[email protected]>
> ---
>
> --This is my contribution to the netfilter project of
> Outreachy Round 14.
>
> net/netfilter/ipvs/ip_vs_ftp.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
> index d30c327..c93c937 100644
> --- a/net/netfilter/ipvs/ip_vs_ftp.c
> +++ b/net/netfilter/ipvs/ip_vs_ftp.c
> @@ -482,11 +482,8 @@ static struct pernet_operations ip_vs_ftp_ops = {
>
> static int __init ip_vs_ftp_init(void)
> {
> - int rv;
> -
> - rv = register_pernet_subsys(&ip_vs_ftp_ops);
> /* rcu_barrier() is called by netns on error */
> - return rv;
> + return register_pernet_subsys(&ip_vs_ftp_ops);
> }
>
> /*

MBR, Sergei