From patchwork Mon Sep 12 18:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9327551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28ECA60231 for ; Mon, 12 Sep 2016 18:44:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DF0428E7E for ; Mon, 12 Sep 2016 18:44:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12A7D28E80; Mon, 12 Sep 2016 18:44:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A866128E7E for ; Mon, 12 Sep 2016 18:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbcILSoD (ORCPT ); Mon, 12 Sep 2016 14:44:03 -0400 Received: from mout.web.de ([212.227.15.3]:49881 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbcILSoC (ORCPT ); Mon, 12 Sep 2016 14:44:02 -0400 Received: from [192.168.1.3] ([77.182.57.148]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0LmuQW-1b6s4f3mKS-00h6fj; Mon, 12 Sep 2016 20:43:50 +0200 Subject: [PATCH 02/47] block-rbd: Less function calls in rbd_header_from_disk() after error detection 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 20:43:46 +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> X-Provags-ID: V03:K0:bqgxSrpOGSOLr6rGD5B8Q4pLqloUJdJvAupibm8SINGNKyPC5Dj WaG3umm9A5HTYgyACpQIbv0SOsNgLLzGXVppCnltP6HHKlV0GWNY4FXa40FD8hxWbYE5cCn fuhlraD3uu3LmBdgOiXGzwE/7WgnPS7E89Xc554cSKzK6qO1IFVhU8wT/xUAhROxsC8H0o7 S4Mr8v9XdfQ7YwYt3dEfQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pGAddMzqowk=:epILkGiozT35cXrUenZfKy OZuo9U9dwyb1hon4jTIT0vDi/DNZ4CX9X0ZbeKCHT9Zb7aWrROAG1tZppq0yLlZUr2XY1JXRK ZrBsMJKiSe120fQmBtRiRUX0BNeeHbU3yXxOv4vPtoE9uwPYi4pLnsoSFNqJgtu9WZEIHH4vM EoRmYektQrC8yzNXFyRwPvhtxPjDrI9nfgWpfzxVnWG8NteEMfDhio6W0ykfaEvmytFYQ8sF1 Ea9QUwb9QwSynrD0BhucJjE1uOu7diFmOO+XcUYOoeEw1p8oxueQtOhlaSyh6oGtlBvcCI9EB 9Hv1MrAvyQq53JZ8jSHH998nqYIYweGx25b/IbbeAVEssthxzpbb0j3h+m4TVe9nH1OEDC+bW dYFVbVJBvNCGeJwixoWN+C/Gd+8HBCJZfaQKU/++iRqG0m4p/M3Us4RxwWjAsXpodqOxRHcka fDoNRXTWdYocKqzgHy3LyLKBoNsYpQwR75MUB4RCTzenYdv5mNl2o4J6jVIxOMI37GbDlp02W 38YKCPmoTBm3cdaJT0AneZwuwtRga7L3+Mw0jEukJdswr3QMG9dAxa/E3EedMNbcwyB0XI9vP h9jdcnLU47dmNBs8ZZxAByCrE2mKDKF+6Li4oxWC0qhEzGXYJi1dlZIv7TvK7sWFZhOz9laNc 1+oLFskSxPkesPB6PVArNDUfXtKirFodpql/VW07YKCxMMTIiDOkULrqXg0FxTtfgUfkTl0bZ 1089eKTC0J78Oigbe4K/LZ11UcpiYJdGliiMjtcejDe+zULbjGwu8VeK+pTbhUDoQoMx/H7q7 MRMMtkD Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 11 Sep 2016 13:18:57 +0200 The functions "ceph_put_snap_context" and "kfree" were called in a few cases by the function "rbd_header_from_disk" during error handling even if the passed variables contained a null pointer. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e406c27..f4212e1 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1001,7 +1001,7 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, snap_count = le32_to_cpu(ondisk->snap_count); snapc = ceph_create_snap_context(snap_count, GFP_KERNEL); if (!snapc) - goto out_err; + goto free_prefix; snapc->seq = le64_to_cpu(ondisk->snap_seq); if (snap_count) { struct rbd_image_snap_ondisk *snaps; @@ -1013,14 +1013,14 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, goto out_2big; snap_names = kmalloc(snap_names_len, GFP_KERNEL); if (!snap_names) - goto out_err; + goto put_snap_context; /* ...as well as the array of their sizes. */ snap_sizes = kmalloc_array(snap_count, sizeof(*header->snap_sizes), GFP_KERNEL); if (!snap_sizes) - goto out_err; + goto free_names; /* * Copy the names, and fill in each snapshot's id @@ -1066,10 +1066,12 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, return 0; out_2big: ret = -EIO; -out_err: kfree(snap_sizes); + free_names: kfree(snap_names); + put_snap_context: ceph_put_snap_context(snapc); + free_prefix: kfree(object_prefix); return ret;