From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B742FC56202 for ; Wed, 18 Nov 2020 02:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D13E2463B for ; Wed, 18 Nov 2020 02:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727152AbgKRCCP (ORCPT ); Tue, 17 Nov 2020 21:02:15 -0500 Received: from smtprelay0158.hostedemail.com ([216.40.44.158]:34520 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726215AbgKRCCP (ORCPT ); Tue, 17 Nov 2020 21:02:15 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id A4858100E7B43; Wed, 18 Nov 2020 02:02:13 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: knee23_130af6d27336 X-Filterd-Recvd-Size: 3831 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf13.hostedemail.com (Postfix) with ESMTPA; Wed, 18 Nov 2020 02:02:12 +0000 (UTC) Message-ID: <6447e7bc3515da26ab7f1b02ed178a6859af789a.camel@perches.com> Subject: Re: [PATCH] net: ipv4: fixed a brace coding style issue From: Joe Perches To: Armin Gholampoor , davem@davemloft.net Cc: linux-kernel@vger.kernel.org Date: Tue, 17 Nov 2020 18:02:11 -0800 In-Reply-To: <20201118063744.214744-1-armingh379@gmail.com> References: <20201118063744.214744-1-armingh379@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2020-11-18 at 01:37 -0500, Armin Gholampoor wrote: > Fixed bracing style issue. > > Signed-off-by: Armin Gholampoor > --- >  net/ipv4/tcp.c | 3 +-- >  1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c > index b2bc3d7fe..37bc91e4a 100644 > --- a/net/ipv4/tcp.c > +++ b/net/ipv4/tcp.c > @@ -3170,8 +3170,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, >   else if (tp->repair_queue == TCP_RECV_QUEUE) { >   WRITE_ONCE(tp->rcv_nxt, val); >   WRITE_ONCE(tp->copied_seq, val); > - } > - else > + } else >   err = -EINVAL; >   break; A more typical brace style would be to use braces on both arms. And there is more than one of these in the file. Please fix them all at the same time rather than just a single instance. Something like: --- net/ipv4/tcp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b285b338a019..ae4ec5e29802 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3155,9 +3155,9 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, break; case TCP_REPAIR: - if (!tcp_can_repair_sock(sk)) + if (!tcp_can_repair_sock(sk)) { err = -EPERM; - else if (val == TCP_REPAIR_ON) { + } else if (val == TCP_REPAIR_ON) { tp->repair = 1; sk->sk_reuse = SK_FORCE_REUSE; tp->repair_queue = TCP_NO_QUEUE; @@ -3168,8 +3168,9 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, } else if (val == TCP_REPAIR_OFF_NO_WP) { tp->repair = 0; sk->sk_reuse = SK_NO_REUSE; - } else + } else { err = -EINVAL; + } break; @@ -3183,16 +3184,16 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, break; case TCP_QUEUE_SEQ: - if (sk->sk_state != TCP_CLOSE) + if (sk->sk_state != TCP_CLOSE) { err = -EPERM; - else if (tp->repair_queue == TCP_SEND_QUEUE) + } else if (tp->repair_queue == TCP_SEND_QUEUE) { WRITE_ONCE(tp->write_seq, val); - else if (tp->repair_queue == TCP_RECV_QUEUE) { + } else if (tp->repair_queue == TCP_RECV_QUEUE) { WRITE_ONCE(tp->rcv_nxt, val); WRITE_ONCE(tp->copied_seq, val); - } - else + } else { err = -EINVAL; + } break; case TCP_REPAIR_OPTIONS: @@ -3261,9 +3262,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, break; } tp->window_clamp = 0; - } else + } else { tp->window_clamp = val < SOCK_MIN_RCVBUF / 2 ? SOCK_MIN_RCVBUF / 2 : val; + } break; case TCP_QUICKACK: @@ -3287,8 +3289,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, break; case TCP_FASTOPEN: - if (val >= 0 && ((1 << sk->sk_state) & (TCPF_CLOSE | - TCPF_LISTEN))) { + if (val >= 0 && + ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN))) { tcp_fastopen_init_key_once(net); fastopen_queue_tune(sk, val);