Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753742AbdHUNxI (ORCPT ); Mon, 21 Aug 2017 09:53:08 -0400 Received: from mout.web.de ([212.227.15.4]:62080 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210AbdHUNxH (ORCPT ); Mon, 21 Aug 2017 09:53:07 -0400 Subject: [PATCH v2] btrfs: Use common error handling code in update_ref_path() To: linux-btrfs@vger.kernel.org, Chris Mason , Dan Carpenter , David Sterba , Jeff Mahoney , Josef Bacik Cc: LKML , kernel-janitors@vger.kernel.org References: <1e8e1da2-a9e3-9dc7-6ffe-6c32f8464337@users.sourceforge.net> <7083c299-4803-68c8-ae57-c0e74f5d9229@users.sourceforge.net> <20170821134215.4wpttdh5siuax5b3@mwanda> From: SF Markus Elfring Message-ID: <1625753e-5334-3774-72e6-685d5629c635@users.sourceforge.net> Date: Mon, 21 Aug 2017 15:52:49 +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: <20170821134215.4wpttdh5siuax5b3@mwanda> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Esa97QDqmMO4iNYAy78yewa/3CU40DOlBG6E8Ca3AG1djuXc57J BeQ/fp6V0edjuRiwiTCWlOzwazh/PM9lFkgTjw/gru5eohaUIv1krd9gU6hEwAYroxlu7U1 lB9KjrA0mrad0vYW87lKW16yCvAHSBukYp9VaU2dWjIfiD5sYfeV/Lr/GABAywC6safi9JW szo7FgeO9iIc7PUYod43Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:lr4+rQf1QmU=:6N2zb1S3IxlrEJ2OsIBNI3 loWzZFFzTzzXYgYmI1x3IiHDzlKOt/8dHBaVYBv0iAReqaqTftmF3xzWNGvWXYQAgEmoHvMEv 3Rtt0p8YivP0rYmtt76buyzA49Tauf3nln80C1g8q+IfiTsTvAI2CEj1qoSyOXmlaXNx9QkKO a4Mls6huxqmImgFB2R1qZ24luR3EWFB/6xDdN4nBykT/PHUkweEvpvyZPB6sN287aOHfvkXAJ aAzzSKOaYiFlSvOnXG+g3sVGRx5LwjsO91dqUyzbz4THCtGdeXl90KBLlSylEuSQHiqVpnwXT 6SK5AICYsOp23ya8jZ+BBheTzp3tJROg3Qj/QeFxuIruPEy8Wu3Xxas4rl4x97pVfY11NEksf 1SOt2ElFASd5ZZh6mT/jRgnLQivLpHfmuDlFpJXQ7R8MhaOcv67ADtsUG4i4A7UpMxzAaKi0c 9z5XDPl/cij3y70An8znJGiJG4rTMXolmGdNuE2gUMMAkMCrh9B/ievBVqi/PM9YcxKsnr5BR +Ki3a7+yogf611wawf8VgoA5epIYtlXeoQaWKHSWRj76K14ExNaoc+VM5bQzbMWBVZbG63mTd Ol5a8yBN1LN5WG5A5EVdjgaYqAmRbb7aRrve7kG2V/A7j8G/KPyQr1F+cwwLvJgiiV+zXZn7E eFlhDQZQwWX0Fu4T9qnMEDU9YMsDK6xRD7ClAJMeLdEyHjgHWjfBe0gTdaHuIbL0nzzvhAE5h ROZTx8C7UfQYYCrSmf0Em6BaNLP5uXGPLbA40tJRgwgXcG46THHq7G9TdjnK21zxtnDrfWIo7 HFExlB4ZyeqpgeJjy4pWvmUDjmhGqvyoXMzrKPPQ4fgWUw1K9ypJVSiktbUxS57pe0xNa6V Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1184 Lines: 52 From: Markus Elfring Date: Mon, 21 Aug 2017 15:45:23 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v2: Do you find this refactoring acceptable instead? fs/btrfs/send.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 59fb1ed6ca20..527a9a735664 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -3697,20 +3697,20 @@ static int update_ref_path(struct send_ctx *sctx, struct recorded_ref *ref) return -ENOMEM; ret = get_cur_path(sctx, ref->dir, ref->dir_gen, new_path); - if (ret < 0) { - fs_path_free(new_path); - return ret; - } + if (ret < 0) + goto free_path; + ret = fs_path_add(new_path, ref->name, ref->name_len); - if (ret < 0) { - fs_path_free(new_path); - return ret; - } + if (ret < 0) + goto free_path; fs_path_free(ref->full_path); set_ref_path(ref, new_path); return 0; +free_path: + fs_path_free(new_path); + return ret; } /* -- 2.14.0