lkml.org 
[lkml]   [2016]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 03/12] staging: lustre: One function call less in class_register_type() after error detection
    From
    Date

    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

    \
     
     \ /
      Last update: 2016-07-26 21:41    [W:4.019 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site