From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444AbdHOMCi (ORCPT ); Tue, 15 Aug 2017 08:02:38 -0400 Received: from mout.web.de ([212.227.15.3]:65069 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbdHOMCg (ORCPT ); Tue, 15 Aug 2017 08:02:36 -0400 Subject: [PATCH 4/5] net/9p: Adjust a jump target in p9_client_attach() From: SF Markus Elfring 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 References: <22a44d7c-cdb9-e206-4b2c-56e38cbf0de1@users.sourceforge.net> Message-ID: Date: Tue, 15 Aug 2017 14:02:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <22a44d7c-cdb9-e206-4b2c-56e38cbf0de1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:RFS5mWeKnwKVVQ8q4nXyt0Xryed2X80WR+ww84JHoZT7MDdz0bf 51kbNt49Vska5v/s+rX8jLx1whArt/5K2I9TpMNAsMqbz3q+ovgda5+LmniOIDyijtC0kOl yPLKhoVbIqk1SOs0/mu5rYuYEEeW0bMugMfjnvULgUG557VzfeM/4l2jVRl7qLbOdCLcNqC 7o15zYNMxsSbCoe28SUQw== X-UI-Out-Filterresults: notjunk:1;V01:K0:AiGa7kBiLU0=:r2HKsulninrU5ptMNLD+Y0 W3RXCCtsz/bEglxuxjA6vHhk8AFVjMekmcjUVtGgjFOJxiymTgN1J1k96YUipDN3UjWS/HxFV pYQS3vg2axkBH3UvPlvwgyQZ9ahxbUX3fZ490E37SV5e9x1ISO1kIFT5gOeTQzAPaRvpWBVYM pgJ/eZFqfRZ9XjHZxHNgQtwZo7fJ6pYg2aCkJFXT5XhPPPE6qXrIkKyQ59iqJAuCrT4n9U8i/ HFSVhpobrrqjXWdczdxXPQPtWhhMSOMoqIKXu20wfSYoZJWb48uCoY1NdAVQMfRosveXXE/eS 65HvX2Tji5QkNjE+MU7TZdM6HcJVLkMsd96J6sreGS+9oIllpzU3SMpsAefnAN7x0npP4NxLD cFo8GCprHnErzVORZ0dXDFGhKnsw4ugKf+XV7t7RZGexr8m/ohF9/+hCfAjnYVMSrQc9dK3V+ Sv+/nfD+ByZhgOLFVBkN4gMP8HPuuc/XYocTJgUQ8rlNr/1cDFWnPOFMu59oqWJdbyQOpyfEh xW9JViUQeyUpUbVbUgdQy0p9K1dCJn05dF3J6wpnifzKm+5U2V3sQFBwhlJ3ZTU3Fv6GHym9D j48kcYuuyFLTBEhU6U0cllCTJ+ItLr5oxtB+gFdbElS2eBakybvXDRbq6llnfDzIHFqdv2ABu kyTHaMp/TgY3GSo4fThz7fz5hDuB7Cg2vPTKJDnlQk5V/l4Orbn8hqfrW/154xhN0kql5MAi+ D8h/7FkUSeiz4cP+hcxCVPrJFc3jEmthrbpMwd59nEzTeYZO3a14ZvX24ak97nc4glhPXxnob gZgqaaVsN381BE9u2hig34DQ/FsKJa7tFMzF+9jzpGHd57DbXk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 15 Aug 2017 11:17:23 +0200 Adjust jump labels so that the function implementation becomes smaller. Delete an extra variable assignment and a check (at the end of this function). Signed-off-by: Markus Elfring --- net/9p/client.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/9p/client.c b/net/9p/client.c index 6c2fc796edfb..38c08171acc6 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1133,25 +1133,23 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid, p9_debug(P9_DEBUG_9P, ">>> TATTACH afid %d uname %s aname %s\n", afid ? afid->fid : -1, uname, aname); fid = p9_fid_create(clnt); - if (IS_ERR(fid)) { - err = PTR_ERR(fid); - fid = NULL; - goto error; - } + if (IS_ERR(fid)) + return fid; + fid->uid = n_uname; req = p9_client_rpc(clnt, P9_TATTACH, "ddss?u", fid->fid, afid ? afid->fid : P9_NOFID, uname, aname, n_uname); if (IS_ERR(req)) { err = PTR_ERR(req); - goto error; + goto destroy_fid; } err = p9pdu_readf(req->rc, clnt->proto_version, "Q", &qid); if (err) { trace_9p_protocol_dump(clnt, req->rc); p9_free_req(clnt, req); - goto error; + goto destroy_fid; } p9_debug(P9_DEBUG_9P, "<<< RATTACH qid %x.%llx.%x\n", @@ -1161,10 +1159,8 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid, p9_free_req(clnt, req); return fid; - -error: - if (fid) - p9_fid_destroy(fid); +destroy_fid: + p9_fid_destroy(fid); return ERR_PTR(err); } EXPORT_SYMBOL(p9_client_attach); -- 2.14.0