Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1450801
| From | Oleg Drokin <oleg.drokin@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 03/12] staging: lustre: One function call less in class_register_type() after error detection |
| Date | 2016-07-26 21:10 +0200 |
| Message-ID | <rZfTQ-5XI-29@gated-at.bofh.it> (permalink) |
| References | (2 earlier) <qIe0h-220-1@gated-at.bofh.it> <qIe9X-25k-7@gated-at.bofh.it> <qIinh-4Eb-35@gated-at.bofh.it> <rZfK9-5Fs-7@gated-at.bofh.it> <rZfTQ-5XI-25@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Jul 26, 2016, at 3:02 PM, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> 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.
But kobject_put() already checks for NULL, right? you just submitted
another batch about that in other area.
> Adjust jump targets according to the Linux coding style convention.
Not that I am totally against this patch, but when we do not need the extra
checks, a single jump target is ok too in my mind (extra benefit - there's
not going to be any chance of a mistake to where to jump to).
And when we have a single jump target, there's no supersmart naming
like free_this_and_that_and_that_other_thing_too.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> 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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/12] staging-Lustre: Fine-tuning for seven function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:00 +0200
[PATCH 01/12] staging/lustre/ldlm: Delete unnecessary checks before the function call "kset_unregister" SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:00 +0200
[PATCH 04/12] staging: lustre: Split a condition check in class_register_type() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 06/12] staging: lustre: Return directly after a failed kcalloc() in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 02/12] staging: lustre: Delete unnecessary checks before the function call "kobject_put" SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 07/12] staging: lustre: Less checks after a failed alloc_page() in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 08/12] staging: lustre: Less checks after a failed ptlrpc_request_alloc() in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 05/12] staging: lustre: Optimize error handling in class_register_type() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
Re: [PATCH 05/12] staging: lustre: Optimize error handling in class_register_type() Oleg Drokin <oleg.drokin@intel.com> - 2016-07-26 21:20 +0200
Re: [lustre-devel] [PATCH 05/12] staging: lustre: Optimize error handling in class_register_type() Oleg Drokin <oleg.drokin@intel.com> - 2016-07-26 21:20 +0200
Re: staging: lustre: Optimize error handling in class_register_type() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 22:20 +0200
Re: [PATCH 03/12] staging: lustre: One function call less in class_register_type() after error detection Oleg Drokin <oleg.drokin@intel.com> - 2016-07-26 21:10 +0200
Re: staging: lustre: One function call less in class_register_type() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 22:00 +0200
Re: staging: lustre: One function call less in class_register_type() after error detection Oleg Drokin <oleg.drokin@intel.com> - 2016-07-27 00:00 +0200
Re: staging: lustre: One function call less in class_register_type() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-28 08:00 +0200
Re: [lustre-devel] staging: lustre: One function call less in class_register_type() after error detection Oleg Drokin <oleg.drokin@intel.com> - 2016-07-29 17:30 +0200
Re: [lustre-devel] staging: lustre: One function call less in class_register_type() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-30 08:30 +0200
[PATCH 03/12] staging: lustre: One function call less in class_register_type() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:10 +0200
[PATCH 12/12] staging: lustre: Delete an unnecessary variable initialisation in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:20 +0200
[PATCH 11/12] staging: lustre: Move an assignment for the variable "eof" in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:20 +0200
[PATCH 10/12] staging: lustre: Rename jump labels in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:20 +0200
[PATCH 09/12] staging: lustre: Delete a check for the variable "req" in mgc_process_recover_log() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-26 21:20 +0200
csiph-web