lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 161/196] Kobject: convert drivers/md/md.c to use kobject_init/add_ng()
    Date
    This converts the code to use the new kobject functions, cleaning up the
    logic in doing so.

    Cc: Neil Brown <neilb@suse.de>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/md/md.c | 13 ++++---------
    1 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/drivers/md/md.c b/drivers/md/md.c
    index f79efb3..7ae9740 100644
    --- a/drivers/md/md.c
    +++ b/drivers/md/md.c
    @@ -1383,16 +1383,13 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
    return -EBUSY;
    }
    bdevname(rdev->bdev,b);
    - if (kobject_set_name(&rdev->kobj, "dev-%s", b) < 0)
    - return -ENOMEM;
    - while ( (s=strchr(rdev->kobj.k_name, '/')) != NULL)
    + while ( (s=strchr(b, '/')) != NULL)
    *s = '!';
    -
    +
    rdev->mddev = mddev;
    printk(KERN_INFO "md: bind<%s>\n", b);

    - rdev->kobj.parent = &mddev->kobj;
    - if ((err = kobject_add(&rdev->kobj)))
    + if ((err = kobject_add_ng(&rdev->kobj, &mddev->kobj, "dev-%s", b)))
    goto fail;

    if (rdev->bdev->bd_part)
    @@ -2036,9 +2033,7 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
    if (err)
    goto abort_free;

    - rdev->kobj.parent = NULL;
    - rdev->kobj.ktype = &rdev_ktype;
    - kobject_init(&rdev->kobj);
    + kobject_init_ng(&rdev->kobj, &rdev_ktype);

    rdev->desc_nr = -1;
    rdev->saved_raid_disk = -1;
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 09:15    [W:4.181 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site