From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757017AbcILTTQ (ORCPT ); Mon, 12 Sep 2016 15:19:16 -0400 Received: from mout.web.de ([212.227.15.4]:54771 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753312AbcILTTM (ORCPT ); Mon, 12 Sep 2016 15:19:12 -0400 Subject: [PATCH 31/47] block-rbd: Fix three jump targets in rbd_img_obj_parent_read_full() 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: <974443eb-d84c-a1e6-833b-675bf8d041ba@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:18:54 +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:LQonc48g4JGVIQiW4AZjXEJrO1TU/JccvROK87J1T9yI5xPPsA9 hmpH9V+rr3eP2CFOI3iNLb/PPAkJxgcws0AC47UfNJ8hKjKBMB0oS8q2PVXpg8EROp/RJh7 UfgXP+uu+OP3avv/lj5BudgUWz8GawQSm7qMEU32UwVZA6uDF6gyRQxQ8XLGVKNrTCJ6VrZ 89donEpjDqg6oLJBs8m2g== X-UI-Out-Filterresults: notjunk:1;V01:K0:dICcY/9Nk+I=:7xFkbut+NwtdhaK9IKLle8 lN/zmh1JhXjC6CD+B6GWlelfAaa5GmtAfQ7xE1IvkTn8kTY8UNnzEltPgFpg94kn6CM2GfLG2 ikySPXL9ORomBJ6z8nXheyK+w1DSXM6SSfORxQjEGh7ZQ8Phl/79vzLJg+qn9RYSLPUlFU1Fk OvdC26Od1Zrx1LNUKde/4jDPZh9xnQqxP/vPYkQMsQLDNWqH9C3a0FYxfkT+kFs3RvKGsGtM+ pO3H6BAmpf/RlB2HTZ3CJEK29caH06ManOdRwJgE5aOu8z4awmyQFRLT+Ilmk6Qh0uC92Vz1t E8bELglV6i5xGCKDh+tMZTSlccZ1KvqI43ho+fJt/eA6cvCU6xHSJafpcGXln+YcU0ohgWaq3 qLFp8yQBKxK+deVXqNHkXZWpa3UB0kW05vGD6uOorU793XYhQ6joZFEovs03SOSB6+IRyCj8U QFNmlZbwcL15H/GyWxXGvSP46dyyDQwxYJ9YYrczKIzU1KwxoDlGR9gzQrgNTrMTueYd+Jnu/ +Vf9ZbRebmLHXjv5RXpNpRQx4i36pzMgcxCK0kTCszv4yyxRiKk2/ZyVUgQW5PnbN2zNuMzwq tDRIFie6Doq9zaPI75EC8qxyNhVegc1jyiVwve6JyDjyRw7txUHFv1Bf9ZWEMLZhqHXyeZkSs 2ExzpX/otkl210O0Lcly/2Rfoq6CjiQt8GLwfESgO0jt6dTjJ1gJQj6LTU8XK6qKLpuyHcgbw HsuvPNNzLpFG5dKVtpIsUYmBOR6Fj0XTa1JRevhEEhWvkUtP9yb8e0VxrbsbN1YnVFDSii9Qq eGXAuwp 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 19:48:46 +0200 * Adjust jump targets according to the current Linux coding style convention. * Delete two duplicate checks then at the end. Signed-off-by: Markus Elfring --- I find that this function implementation needs another close look. It seems that four lines can not be executed according to the shown control flow at the moment. How do you think about to avoid "dead" source code there anyhow? drivers/block/rbd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 7d5f7b9..1b8a8c5 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2789,18 +2789,18 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request) if (IS_ERR(pages)) { result = PTR_ERR(pages); pages = NULL; - goto out_err; + goto status_indication; } result = -ENOMEM; parent_request = rbd_parent_request_create(obj_request, img_offset, length); if (!parent_request) - goto out_err; + goto release_page_vector; result = rbd_img_request_fill(parent_request, OBJ_REQUEST_PAGES, pages); if (result) - goto out_err; + goto put_request; parent_request->copyup_pages = pages; parent_request->copyup_page_count = page_count; @@ -2813,11 +2813,11 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request) parent_request->copyup_page_count = 0; parent_request->obj_request = NULL; rbd_obj_request_put(obj_request); -out_err: - if (pages) - ceph_release_page_vector(pages, page_count); - if (parent_request) - rbd_img_request_put(parent_request); + put_request: + rbd_img_request_put(parent_request); + release_page_vector: + ceph_release_page_vector(pages, page_count); + status_indication: obj_request->result = result; obj_request->xferred = 0; obj_request_done_set(obj_request); -- 2.10.0