From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757452AbcILSuG (ORCPT ); Mon, 12 Sep 2016 14:50:06 -0400 Received: from mout.web.de ([212.227.15.4]:65402 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754071AbcILSuC (ORCPT ); Mon, 12 Sep 2016 14:50:02 -0400 Subject: [PATCH 08/47] block-rbd: Rename jump labels in rbd_dev_v2_snap_context() To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <81e205ce-9e99-397d-79dc-d06da3921fa1@users.sourceforge.net> Date: Mon, 12 Sep 2016 20:49:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:XP1KKvYw8n+lUG0kmBDJ6qSjAozT5/mNe7v75mOtILv2EeOi3HT KA66d2mkjxi2SXyJS3xGT2sF+TkUtW4e5qCiPohTcV8V2J5V3ZYM9PtXfPgwQ8uTpTkIkMO sX9ATVoYKYH7HodnH9CpvYAEDqsWXsxY7ZBQPzUnMRVSp9zARdb6Dt+A1NIVjYlWA1mRLTQ LghYnVBR+N4jGxaqNdQdA== X-UI-Out-Filterresults: notjunk:1;V01:K0:6PgFz/E84b8=:UHb7HhhMoyS8p1fdZrqNgk WN88Dr6WFmlTQB2nlsHDxv/g70rR60uN1iD4vXRkhzBgToY9x8u/rmqfgTgZzYBu+40Y2lVgI BYLwpxNNRCVjIDQYNNKkzs43EM7kKU3dkZCz9ZbCGGmpYWhGAiQvvVlFAm/Fp9kho1tnMwedS KKNkyVz1GzG4w5uyHmI7ctpDl4zgKuFMHiNqZp2qZEAfn97vKQA3L5ZV4Ugbp5frhQBaJeAOD fcR+uiKq8GPodRjOc9xBLiGeLXzI6tnfe90DClJt8EvZppbJ4TPcxvOjphZl1okTdsS3I8C89 SHimuvtnlygdDvx/gLZsGwEVSQqXSNDqhvBrKWAS1MWOX5hraTBQKf/JJzZyF5+VA5iPSu4G/ pFBFYlasOs04co73yydbiJAGOPEeAfT+LGRfUP8QlF5c6wWEcLul5YbfvyiEHUD3aIKqPOR9t TbsZuH07tlvkIqQQLa1zjmdfxrJEwjVz5xXuVSznH2FEl4LehsGmTIrulKF6rkEz7oz7GD8K5 +dmWuC2YallnTpDVmh0XV01Eh+ye5x0a/3O0YtcKUZKMzwJFMAA9S/7QyulbxHU0ZgGz4ETA1 u/kaslDlh2XPCIKMlj/e05mbA6cnT0kroTmcTjU22gdRhjKZAmQmFjycc0DO33fOtlLXZ9WIk KXON3xA5QT1qkxsTkI1SBOXvGEgbZ6NT6aqqUD+3Cm+O0R9PBIKPJjixDKgXA1REEhK13evND RswU3hfZYEs8UA5qswG/iGt2CyPg4jDAjzqvUyU9axqCQxEfa+5OS4pkdEsBAKqzkyTvN0f+b JZzi1hx Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 12 Sep 2016 17:55:51 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4164551..45109ff 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5465,13 +5465,13 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev) reply_buf, size); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); if (ret < 0) - goto out; + goto free_buffer; p = reply_buf; end = reply_buf + ret; ret = -ERANGE; - ceph_decode_64_safe(&p, end, seq, out); - ceph_decode_32_safe(&p, end, snap_count, out); + ceph_decode_64_safe(&p, end, seq, free_buffer); + ceph_decode_32_safe(&p, end, snap_count, free_buffer); /* * Make sure the reported number of snapshot ids wouldn't go @@ -5482,16 +5482,16 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev) if (snap_count > (SIZE_MAX - sizeof (struct ceph_snap_context)) / sizeof (u64)) { ret = -EINVAL; - goto out; + goto free_buffer; } if (!ceph_has_room(&p, end, snap_count * sizeof (__le64))) - goto out; + goto free_buffer; ret = 0; snapc = ceph_create_snap_context(snap_count, GFP_KERNEL); if (!snapc) { ret = -ENOMEM; - goto out; + goto free_buffer; } snapc->seq = seq; for (i = 0; i < snap_count; i++) @@ -5502,7 +5502,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev) dout(" snap context seq = %llu, snap_count = %u\n", (unsigned long long)seq, (unsigned int)snap_count); -out: + free_buffer: kfree(reply_buf); return ret; -- 2.10.0