From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758025AbdKGQVt (ORCPT ); Tue, 7 Nov 2017 11:21:49 -0500 Received: from mout.web.de ([212.227.15.3]:52216 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbdKGQVr (ORCPT ); Tue, 7 Nov 2017 11:21:47 -0500 To: v9fs-developer@lists.sourceforge.net, netdev@vger.kernel.org, "David S. Miller" , Eric Van Hensbergen , Latchesar Ionkov , Ron Minnich Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH RFC v1] 9p/trans_fd: Use common error handling code in p9_fd_create_tcp() Message-ID: <827791c8-6eae-18ff-80e5-192b609e555f@users.sourceforge.net> Date: Tue, 7 Nov 2017 17:21:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:DDDvVoK9H7tRokSja/CSTtaZDbhBYKYtKALOU9xAR/dDfrOK37g u3qSCO8b8tharCa+vaCSwBWobP+nOpKi07QysRKCJ1jKadmrYgRI5nvkG6TqwuI/bYqbwQc r4YUqBZnf5ZKox79Bny0uWt+vnAt3BmARQC142ln/DGr0kSCYpNzTrJqKPFpIP59uh4Vxs0 CpJGTqayIkE7tsQwUGVOA== X-UI-Out-Filterresults: notjunk:1;V01:K0:OPoVgZqIUk0=:sQMFQSBmXQGUjntbccsq5D PEOOTEwWerjS7JDHypFe6p9P2iSvlRaKVXfQsbwB5l+Rz4k/DufznlCEDEEPkdW3V04pnmwWY jnDqiAYsPiCrGe/nVEg9fwrUMCvS8BDcWhItbAQkjPIJBnlyaeDcrAyx74smGLRzTJU4VUIxw q3A+gK03ztjmnMKPiDxOqqxQEc/8BlVVHmRuc/isy9D8rDFQMGqqViNvEFB6WJqNr6UwBWKYH LxxWx/sevP3TlnJMImIRVSqNDTJvca/ONQOaNJ5bh0TzVDjjM7U26jS/2Jy7QhNHutWVH2CN6 GPXUkc+GaY3dJ3zkSJ+RMqYvUm+A3xsd/+AaLvLEsmyb0hmeBOveWyRM9/dlRXkUzVX7WegBg aB5saJ5YomFdj1BAtzwFFT0Vw+tdWvs6tRrYBM8aZwNrerzk5pVJ1u9x3jgFPE+9vTdL5h4O1 zO7FDzNZbujRSalVUUfq91g4/6+aHmnkL2SCMI5+eJN3xrJgO9GmircB2VGlpd5YdriQ4w8Vj TMCYnH33B2Qa0SfSnV+1bZruCpbSAf+z1DCo5Oh9UMQ7+tmPRetwnC/5HVg5snYipJPLaNcqd /exyvP4GopvgCEmeFco3oFuvWTEma/Kx+XZHiH0x7i0l2c3gR2YG5BOvq5nzzLGQH5PSm3tdP YBKXBiSsDX7p8HUG5PgcxP9z+5AHIF19+pq5ce/dlYkrKZKAuPs8YQCWzD8rIBkCQ2asgHvc8 af479I0c9WER933IN3FgrK4SDQjt5gwIZPcaoy40H8JvRHyAI9Pfdw11PfGloVUtIoSsgiqex UJ8FrQtn3T7N33PBseXN+MA5tkDrbBHZTw7YXsmPMOmRluaRMY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 7 Nov 2017 10:05:20 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v1 - Request for comments: I can offer another bit of information for a software development discussion. ๐Ÿ’ญ The affected source file can be compiled for the processor architecture โ€œx86_64โ€ by a tool like โ€œGCC 6.4.1+r251631-1.3โ€ from the software distribution โ€œopenSUSE Tumbleweedโ€ with the following command example. my_cc=/usr/bin/gcc-6 \ && my_module=net/9p/trans_fd.o \ && for XYZ in 0 s 3; do echo " _____ $XYZ _____" \ && my_extra="-O$XYZ" \ && git checkout next-20171102 \ && make -j4 CC="${my_cc}" HOSTCC="${my_cc}" EXTRA_CFLAGS="${my_extra}" allmodconfig "${my_module}" \ && size "${my_module}" \ && git checkout ':/^9p/trans_fd: Use common error handling code in p9_fd_create_tcp' \ && make -j4 CC="${my_cc}" HOSTCC="${my_cc}" EXTRA_CFLAGS="${my_extra}" allmodconfig "${my_module}" \ && size "${my_module}"; done ๐Ÿ”ฎ Do you find the following differences worth for further clarification? โ•”โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•คโ•โ•โ•โ•โ•โ•โ•— โ•‘ setting โ”‚ text โ•‘ โ• โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•ชโ•โ•โ•โ•โ•โ•โ•ฃ โ•‘ O0 โ”‚ -14 โ•‘ โ•‘ Os โ”‚ +13 โ•‘ โ•‘ O3 โ”‚ 0 โ•‘ โ•šโ•โ•โ•โ•โ•โ•โ•โ•โ•โ•งโ•โ•โ•โ•โ•โ•โ• net/9p/trans_fd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 903a190319b9..161c2249ca2a 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -974,8 +974,7 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args) if (err < 0) { pr_err("%s (%d): problem binding to privport\n", __func__, task_pid_nr(current)); - sock_release(csocket); - return err; + goto release_socket; } } @@ -985,11 +984,14 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args) if (err < 0) { pr_err("%s (%d): problem connecting socket to %s\n", __func__, task_pid_nr(current), addr); - sock_release(csocket); - return err; + goto release_socket; } return p9_socket_open(client, csocket); + +release_socket: + sock_release(csocket); + return err; } static int -- 2.15.0