lkml.org 
[lkml]   [2006]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/6] add holders/slaves subdirectory to /sys/block
    This patch is part of dm/md sysfs dependency tree.

    With this patch, "slaves" and "holders" directories are
    created in /sys/block/<disk> and
    "holders" directory is created in /sys/block/<disk>/<partition>.

    Thanks,
    --
    Jun'ichi Nomura, NEC Solutions (America), Inc.
    Creating "slaves" and "holders" directories in /sys/block/<disk> and
    creating "holders" directory under /sys/block/<disk>/<partition>

    Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>

    fs/partitions/check.c | 27 +++++++++++++++++++++++++++
    include/linux/genhd.h | 3 +++
    2 files changed, 30 insertions(+)

    --- linux-2.6.16-rc5.orig/include/linux/genhd.h 2006-02-27 00:09:35.000000000 -0500
    +++ linux-2.6.16-rc5/include/linux/genhd.h 2006-03-02 10:29:55.000000000 -0500
    @@ -78,6 +78,7 @@ struct hd_struct {
    sector_t start_sect;
    sector_t nr_sects;
    struct kobject kobj;
    + struct kobject *holder_dir;
    unsigned ios[2], sectors[2]; /* READs and WRITEs */
    int policy, partno;
    };
    @@ -114,6 +115,8 @@ struct gendisk {
    int number; /* more of the same */
    struct device *driverfs_dev;
    struct kobject kobj;
    + struct kobject *holder_dir;
    + struct kobject *slave_dir;

    struct timer_rand_state *random;
    int policy;
    --- linux-2.6.16-rc5.orig/fs/partitions/check.c 2006-02-27 00:09:35.000000000 -0500
    +++ linux-2.6.16-rc5/fs/partitions/check.c 2006-03-02 10:29:55.000000000 -0500
    @@ -297,6 +297,25 @@ struct kobj_type ktype_part = {
    .sysfs_ops = &part_sysfs_ops,
    };

    +static inline void partition_sysfs_add_subdir(struct hd_struct *p)
    +{
    + struct kobject *k;
    +
    + k = kobject_get(&p->kobj);
    + p->holder_dir = kobject_add_dir(k, "holders");
    + kobject_put(k);
    +}
    +
    +static inline void disk_sysfs_add_subdirs(struct gendisk *disk)
    +{
    + struct kobject *k;
    +
    + k = kobject_get(&disk->kobj);
    + disk->holder_dir = kobject_add_dir(k, "holders");
    + disk->slave_dir = kobject_add_dir(k, "slaves");
    + kobject_put(k);
    +}
    +
    void delete_partition(struct gendisk *disk, int part)
    {
    struct hd_struct *p = disk->part[part-1];
    @@ -310,6 +329,8 @@ void delete_partition(struct gendisk *di
    p->ios[0] = p->ios[1] = 0;
    p->sectors[0] = p->sectors[1] = 0;
    devfs_remove("%s/part%d", disk->devfs_name, part);
    + if (p->holder_dir)
    + kobject_unregister(p->holder_dir);
    kobject_unregister(&p->kobj);
    }

    @@ -337,6 +358,7 @@ void add_partition(struct gendisk *disk,
    p->kobj.parent = &disk->kobj;
    p->kobj.ktype = &ktype_part;
    kobject_register(&p->kobj);
    + partition_sysfs_add_subdir(p);
    disk->part[part-1] = p;
    }

    @@ -383,6 +405,7 @@ void register_disk(struct gendisk *disk)
    if ((err = kobject_add(&disk->kobj)))
    return;
    disk_sysfs_symlinks(disk);
    + disk_sysfs_add_subdirs(disk);
    kobject_uevent(&disk->kobj, KOBJ_ADD);

    /* No minors to use for partitions */
    @@ -483,6 +506,10 @@ void del_gendisk(struct gendisk *disk)

    devfs_remove_disk(disk);

    + if (disk->holder_dir)
    + kobject_unregister(disk->holder_dir);
    + if (disk->holder_dir)
    + kobject_unregister(disk->slave_dir);
    if (disk->driverfs_dev) {
    char *disk_name = make_block_name(disk);
    sysfs_remove_link(&disk->kobj, "device");
    \
     
     \ /
      Last update: 2006-03-04 01:58    [W:0.026 / U:0.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site