diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-20 10:29:28 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-20 10:29:28 +1100 |
commit | de02e44e354c66cfa6595927982a97076a765f79 (patch) | |
tree | 77b21d5f52e116c3653c32e7ea15cea475487a74 /block | |
parent | 67a04eced5c9fcee073dd02560628b1bbe7c495d (diff) | |
parent | 615ca15d7c92ec1540388dd4fb22d7332a4e3ac2 (diff) |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'block')
-rw-r--r-- | block/bsg.c | 6 | ||||
-rw-r--r-- | block/genhd.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/block/bsg.c b/block/bsg.c index e8bd2475682a..f8b4c3d293ae 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -42,7 +42,7 @@ struct bsg_device { int done_cmds; wait_queue_head_t wq_done; wait_queue_head_t wq_free; - char name[BUS_ID_SIZE]; + char name[20]; int max_queue; unsigned long flags; }; @@ -779,7 +779,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode, mutex_lock(&bsg_mutex); hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode))); - strncpy(bd->name, rq->bsg_dev.class_dev->bus_id, sizeof(bd->name) - 1); + strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1); dprintk("bound to <%s>, max queue %d\n", format_dev_t(buf, inode->i_rdev), bd->max_queue); @@ -990,7 +990,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent, if (name) devname = name; else - devname = parent->bus_id; + devname = dev_name(parent); /* * we need a proper transport to send commands, not a stacked device diff --git a/block/genhd.c b/block/genhd.c index 27549e470da5..97e7e3473879 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1069,7 +1069,7 @@ dev_t blk_lookup_devt(const char *name, int partno) struct gendisk *disk = dev_to_disk(dev); struct hd_struct *part; - if (strcmp(dev->bus_id, name)) + if (strcmp(dev_name(dev), name)) continue; part = disk_get_part(disk, partno); |