Commit f6477ec6 authored by Gavrilov Ilia's avatar Gavrilov Ilia Committed by Pablo Neira Ayuso

netfilter: conntrack: remote a return value of the 'seq_print_acct' function.

The static 'seq_print_acct' function always returns 0.

Change the return value to 'void' and remove unnecessary checks.

Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with SVACE.

Fixes: 1ca9e417 ("netfilter: Remove uses of seq_<foo> return values")
Signed-off-by: default avatarIlia.Gavrilov <Ilia.Gavrilov@infotecs.ru>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 28af0f00
...@@ -275,7 +275,7 @@ static const char* l4proto_name(u16 proto) ...@@ -275,7 +275,7 @@ static const char* l4proto_name(u16 proto)
return "unknown"; return "unknown";
} }
static unsigned int static void
seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
{ {
struct nf_conn_acct *acct; struct nf_conn_acct *acct;
...@@ -283,14 +283,12 @@ seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) ...@@ -283,14 +283,12 @@ seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
acct = nf_conn_acct_find(ct); acct = nf_conn_acct_find(ct);
if (!acct) if (!acct)
return 0; return;
counter = acct->counter; counter = acct->counter;
seq_printf(s, "packets=%llu bytes=%llu ", seq_printf(s, "packets=%llu bytes=%llu ",
(unsigned long long)atomic64_read(&counter[dir].packets), (unsigned long long)atomic64_read(&counter[dir].packets),
(unsigned long long)atomic64_read(&counter[dir].bytes)); (unsigned long long)atomic64_read(&counter[dir].bytes));
return 0;
} }
/* return 0 on success, 1 in case of error */ /* return 0 on success, 1 in case of error */
...@@ -342,8 +340,7 @@ static int ct_seq_show(struct seq_file *s, void *v) ...@@ -342,8 +340,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
if (seq_has_overflowed(s)) if (seq_has_overflowed(s))
goto release; goto release;
if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL)) seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL);
goto release;
if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status))) if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status)))
seq_puts(s, "[UNREPLIED] "); seq_puts(s, "[UNREPLIED] ");
...@@ -352,8 +349,7 @@ static int ct_seq_show(struct seq_file *s, void *v) ...@@ -352,8 +349,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
ct_show_zone(s, ct, NF_CT_ZONE_DIR_REPL); ct_show_zone(s, ct, NF_CT_ZONE_DIR_REPL);
if (seq_print_acct(s, ct, IP_CT_DIR_REPLY)) seq_print_acct(s, ct, IP_CT_DIR_REPLY);
goto release;
if (test_bit(IPS_HW_OFFLOAD_BIT, &ct->status)) if (test_bit(IPS_HW_OFFLOAD_BIT, &ct->status))
seq_puts(s, "[HW_OFFLOAD] "); seq_puts(s, "[HW_OFFLOAD] ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment