From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964909AbcGZTCu (ORCPT ); Tue, 26 Jul 2016 15:02:50 -0400 Received: from mout.web.de ([212.227.15.4]:49183 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964839AbcGZTCo (ORCPT ); Tue, 26 Jul 2016 15:02:44 -0400 Subject: [PATCH 03/12] staging: lustre: One function call less in class_register_type() after error detection To: devel@driverdev.osuosl.org, lustre-devel@lists.lustre.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> <56784F0C.6040007@users.sourceforge.net> <20151221234857.GA27079@kroah.com> <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Bhumika Goyal From: SF Markus Elfring Message-ID: Date: Tue, 26 Jul 2016 21:02:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:hyCE0TfFwu+2fZrQeix9yYNQkNjb+uW5ieX/RKwJUyHRuY6PB5J HtPl2BUtpQZ2/h1ECVvG4dm9i23KVa+pUuL0+vIUj93ALRisHKf9YAnoVQr9WKYpzn18iL0 qnEHLvsq+hAdUI0ZWv1WSFMp/xmhBvPDHwlS9jZCIaC8wbhy1Cxk2Yv5wHD5byxyg6S1lZE /n5HGwMQE4AK+8elh07rQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:75aQxWcI1yk=:pplAJWk61C2zQDuzq46SHa vq+ITZdl5KQ1H6MBShlJH0+NMGZuGMw9opFcKv1RijcFV1XS4cnD34Zo+ulULhsK5svDwz0ly IZ+GSr6EdHT9/8vsb1SCQG0Ff30EUEA0bfg0s34AfdV/eIGDurvKlCztsJk2EGUMHfyV6rZCf b9kBe3Y00Nn1Upp0RVRqFIemUJ/cQmZ3FnZuIur8/5g1tWlqEsMS9aNr34rYyD9MkyUdmsusI PJtCCMJFsEzr4vOy5o6j149ryTNLK3WCJdEKS5bAcDN75vlUdyNgzVDmh0bt6WWznsMe/fYmP tAZb+1sHnWpny6Tx4x8K7coNvsb4sz9/8wB23dHHuLJ17EaJ2eRzIpzHWLLroQE425LxPuhZ1 YqnXG3vNJA1StpmMYb7yw7Dd0dIsbY8mvyC1wgV11Yx06UDW4ZZzLVT+NVS59un5CVsEi1m+q c/I6OA6QgbYXyHqWp5T7sLVWpo38yltfX1aBexvf9FemiFtOnuZEXjcvl2haXw1H7lm2lEukE YeJ7msUsCSnKovN7/ZFi+Q9zmmh357K60WGuoBF3cRBQg7/ewSMihtdyBvgFT5NWsRpGDoRq8 TEnMJfwIMK0XMPLJP6Hpr9AENDI88uHNHbxDpc/ZDl7oqviprP+e+T0w3wAKJxCPLopQb8Z7H pus8oVXK5I0MpUaNpf48F5NmsK33Y4BiULxumVIT/fpddBD/cH/TTVGtDIro3hWyhHcxltJpP bRtVQNvqj7Ohg1tZCA35bT0JsE+jYezgK2ZCeIJmn+JGBcGBQMB1S3s61g4ZZrlY/70hiJlvM Xl74bD/ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 26 Jul 2016 13:40:47 +0200 The kobject_put() function was called in a few cases by the class_register_type() function during error handling even if the passed data structure element did not contain a pointer for a valid data item. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/obdclass/genops.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c index 1b5aa9b..10dd145 100644 --- a/drivers/staging/lustre/lustre/obdclass/genops.c +++ b/drivers/staging/lustre/lustre/obdclass/genops.c @@ -164,7 +164,7 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, if (!type->typ_dt_ops || !type->typ_md_ops || !type->typ_name) - goto failed; + goto free_name; *(type->typ_dt_ops) = *dt_ops; /* md_ops is optional */ @@ -180,20 +180,20 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, rc = type->typ_debugfs_entry ? PTR_ERR(type->typ_debugfs_entry) : -ENOMEM; type->typ_debugfs_entry = NULL; - goto failed; + goto free_name; } type->typ_kobj = kobject_create_and_add(type->typ_name, lustre_kobj); if (!type->typ_kobj) { rc = -ENOMEM; - goto failed; + goto free_name; } if (ldt) { type->typ_lu = ldt; rc = lu_device_type_init(ldt); if (rc != 0) - goto failed; + goto put_object; } spin_lock(&obd_types_lock); @@ -201,9 +201,9 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, spin_unlock(&obd_types_lock); return 0; - - failed: +put_object: kobject_put(type->typ_kobj); +free_name: kfree(type->typ_name); kfree(type->typ_md_ops); kfree(type->typ_dt_ops); -- 2.9.2