From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932301AbcILTB6 (ORCPT ); Mon, 12 Sep 2016 15:01:58 -0400 Received: from mout.web.de ([212.227.15.4]:53989 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014AbcILTBz (ORCPT ); Mon, 12 Sep 2016 15:01:55 -0400 Subject: [PATCH 16/47] block-rbd: Rename jump labels in rbd_dev_v1_header_info() 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: Date: Mon, 12 Sep 2016 21:01:42 +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:Swx0G7HtD/xKrY8QvDsi0g/kZmuEHmV9X/+J9XB5yz6Av8ssxUl 51ToB3KMAv9wjtY2NmFz6daVZZUAtap8eO3O0QYO5CGAlUoD6tF8EcdYPvjCdv5jI+NgU8S mZmqP1WqeFKM2kgb805Qefg1hfOETJ2z2f5GwqTKpVkj1UEAC2ZCC0Pe57OpqARvtWvEBng ZPTuJ9ABQQPzHxjhGr5eg== X-UI-Out-Filterresults: notjunk:1;V01:K0:FrU572UWMjQ=:fuVjDhVOVTO9iaU2gILHUW u5IF5TuSanGpWkhC3QnRtqDcx7Ew2XGT1HfCo8+AzV0VbDHaJ3zdYsERr3ntKpw9XpsS0l3GJ 4tbfsRtF6hgP338j3mLH75ZyilspLctWHR20rOjGbobMW4H8K8IklZLBuKwZKX5d4ss+FGT41 gteZWlTUMMLzbpnAwhy9yZjcpWBoMNjPuL9Srk7sBYtgq5oDH6Rz21lSePYrUJjYvfT0Y4qVN ASpsbeHrAURkr486NWDxlbOVTIgqdtlHqwIxP5tAu7ia9vpTQyFHDnJoohJVfvPoA8DGLjb3S ndR01aDzlJAyat1Mw3Lk2mQ6eFXwKA7MZPHueS8PqhYpOpVaP0DR5ehN3m9jJGOhW8ZITyGNs bAcQYT0rktW26Lu9bioIC9fp0emijx16YM18npeZPbXSp5lyCESCvByhk3Raqo6/lTEPm7KJp w45qObE4bkm4yIlmRwP9GK/BttCUUb8e27mLRM9DFAaxRb/rmNC2+xNogOHRL4LwhKK7O1ZzE P/czmYSqhTJBcYf+oUZUzsH+hRzFXFg3cCvpQK+vmUhJDIsJuPhdgAmm6mWqhQSmZ/nIvcJox yE1GQ00lO18ZgxgC65h1bGhxBtwkZbZkujWZ572D5tXpxZ0LYUH5c9QWTYRHrSgiogatyUeY5 N5vNw89EdmwiL7fPuJi6NS9UAMFSld8d5KhFeclz7nuRsnpEZKyI2p0pcRN+boXFPGywcgwKv FDGqCFfAXBwpYVAdy9qyhRSmB6z9L3BBHWvYYUixo7xyJxiC3HCoelKQjHe3imuuHnAEjRnsG iFi7ne/ 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 18:15:44 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 262805a..0b6f0f9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4352,17 +4352,17 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev) ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_oid.name, 0, size, ondisk); if (ret < 0) - goto out; + goto free_header; if ((size_t)ret < size) { ret = -ENXIO; rbd_warn(rbd_dev, "short header read (want %zd got %d)", size, ret); - goto out; + goto free_header; } if (!rbd_dev_ondisk_valid(ondisk)) { ret = -ENXIO; rbd_warn(rbd_dev, "invalid header"); - goto out; + goto free_header; } names_size = le64_to_cpu(ondisk->snap_names_len); @@ -4371,7 +4371,7 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev) } while (snap_count != want_count); ret = rbd_header_from_disk(rbd_dev, ondisk); -out: + free_header: kfree(ondisk); return ret; -- 2.10.0