From:   Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
To:     "leon@kernel.org" <leon@kernel.org>
CC:     Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>,
        "coreteam@netfilter.org" <coreteam@netfilter.org>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "edumazet@google.com" <edumazet@google.com>,
        "fw@strlen.de" <fw@strlen.de>, "joe@perches.com" <joe@perches.com>,
        "kadlec@netfilter.org" <kadlec@netfilter.org>,
        "kuba@kernel.org" <kuba@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "lvc-project@linuxtesting.org" <lvc-project@linuxtesting.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "netfilter-devel@vger.kernel.org" <netfilter-devel@vger.kernel.org>,
        "pabeni@redhat.com" <pabeni@redhat.com>,
        "pablo@netfilter.org" <pablo@netfilter.org>
Subject: [PATCH v2] netfilter: conntrack: remote a return value of the
 'seq_print_acct' function.
Thread-Topic: [PATCH v2] netfilter: conntrack: remote a return value of the
 'seq_print_acct' function.
Thread-Index: AQHZLzdwu2dpvZ83O0uhtAvrU7ziYQ==
Date:   Mon, 23 Jan 2023 14:31:54 +0000
Message-ID: <20230123143202.1785569-1-Ilia.Gavrilov@infotecs.ru>
References: <Y86Lji5prQEAxKLi@unreal>
In-Reply-To: <Y86Lji5prQEAxKLi@unreal>
Accept-Language: ru-RU, en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Precedence: bulk

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: 1ca9e41770cb ("netfilter: Remove uses of seq_<foo> return values")
Signed-off-by: Ilia.Gavrilov <Ilia.Gavrilov@infotecs.ru>
---
V2: Fix coding style
 net/netfilter/nf_conntrack_standalone.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_con=
ntrack_standalone.c
index 0250725e38a4..6819d07f9692 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -275,7 +275,7 @@ static const char* l4proto_name(u16 proto)
 	return "unknown";
 }
=20
-static unsigned int
+static void
 seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
 {
 	struct nf_conn_acct *acct;
@@ -283,14 +283,12 @@ seq_print_acct(struct seq_file *s, const struct nf_co=
nn *ct, int dir)
=20
 	acct =3D nf_conn_acct_find(ct);
 	if (!acct)
-		return 0;
+		return;
=20
 	counter =3D acct->counter;
 	seq_printf(s, "packets=3D%llu bytes=3D%llu ",
 		   (unsigned long long)atomic64_read(&counter[dir].packets),
 		   (unsigned long long)atomic64_read(&counter[dir].bytes));
-
-	return 0;
 }
=20
 /* return 0 on success, 1 in case of error */
@@ -342,8 +340,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
 	if (seq_has_overflowed(s))
 		goto release;
=20
-	if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL))
-		goto release;
+	seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL);
=20
 	if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status)))
 		seq_puts(s, "[UNREPLIED] ");
@@ -352,8 +349,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
=20
 	ct_show_zone(s, ct, NF_CT_ZONE_DIR_REPL);
=20
-	if (seq_print_acct(s, ct, IP_CT_DIR_REPLY))
-		goto release;
+	seq_print_acct(s, ct, IP_CT_DIR_REPLY);
=20
 	if (test_bit(IPS_HW_OFFLOAD_BIT, &ct->status))
 		seq_puts(s, "[HW_OFFLOAD] ");
--=20
2.30.2