lkml.org 
[lkml]   [2009]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 04/13] Driver Core: block: add nodename support for block drivers.
    From: Kay Sievers <kay.sievers@vrfy.org>

    This adds support for block drivers to report their requested nodename
    to userspace. It also updates a number of block drivers to provide the
    needed subdirectory and device name to be used for them.

    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    block/genhd.c | 10 ++++++++++
    drivers/block/pktcdvd.c | 7 +++++++
    include/linux/genhd.h | 2 +-
    3 files changed, 18 insertions(+), 1 deletion(-)

    --- a/block/genhd.c
    +++ b/block/genhd.c
    @@ -985,10 +985,20 @@ struct class block_class = {
    .name = "block",
    };

    +static char *block_nodename(struct device *dev)
    +{
    + struct gendisk *disk = dev_to_disk(dev);
    +
    + if (disk->nodename)
    + return disk->nodename(disk);
    + return NULL;
    +}
    +
    static struct device_type disk_type = {
    .name = "disk",
    .groups = disk_attr_groups,
    .release = disk_release,
    + .nodename = block_nodename,
    };

    #ifdef CONFIG_PROC_FS
    --- a/drivers/block/pktcdvd.c
    +++ b/drivers/block/pktcdvd.c
    @@ -2853,6 +2853,11 @@ static struct block_device_operations pk
    .media_changed = pkt_media_changed,
    };

    +static char *pktcdvd_nodename(struct gendisk *gd)
    +{
    + return kasprintf(GFP_KERNEL, "pktcdvd/%s", gd->disk_name);
    +}
    +
    /*
    * Set up mapping from pktcdvd device to CD-ROM device.
    */
    @@ -2905,6 +2910,7 @@ static int pkt_setup_dev(dev_t dev, dev_
    disk->fops = &pktcdvd_ops;
    disk->flags = GENHD_FL_REMOVABLE;
    strcpy(disk->disk_name, pd->name);
    + disk->nodename = pktcdvd_nodename;
    disk->private_data = pd;
    disk->queue = blk_alloc_queue(GFP_KERNEL);
    if (!disk->queue)
    @@ -3060,6 +3066,7 @@ static const struct file_operations pkt_
    static struct miscdevice pkt_misc = {
    .minor = MISC_DYNAMIC_MINOR,
    .name = DRIVER_NAME,
    + .name = "pktcdvd/control",
    .fops = &pkt_ctl_fops
    };

    --- a/include/linux/genhd.h
    +++ b/include/linux/genhd.h
    @@ -140,7 +140,7 @@ struct gendisk {
    * disks that can't be partitioned. */

    char disk_name[DISK_NAME_LEN]; /* name of major driver */
    -
    + char *(*nodename)(struct gendisk *gd);
    /* Array of pointers to partitions indexed by partno.
    * Protected with matching bdev lock but stat and other
    * non-critical accesses use RCU. Always access through



    \
     
     \ /
      Last update: 2009-05-09 16:47    [W:0.038 / U:328.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site