diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 12:11:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 12:11:40 +1100 |
| commit | 01501ac8c2d4e8319e67b4549d9ae95c2213fd65 (patch) | |
| tree | 0663ef3451d24e66d045f3c4f539644aebb15d56 /fs | |
| parent | ca2adce277c336a6992f6cfe1623d7b10e370cdb (diff) | |
| parent | a0c256bb9a2dd230ea9cd0da8c9f430d06b4599f (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/partitions/check.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 6d5b213b8a9b..5198ada67398 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -384,9 +384,9 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, dname = dev_name(ddev); if (isdigit(dname[strlen(dname) - 1])) - snprintf(pdev->bus_id, BUS_ID_SIZE, "%sp%d", dname, partno); + dev_set_name(pdev, "%sp%d", dname, partno); else - snprintf(pdev->bus_id, BUS_ID_SIZE, "%s%d", dname, partno); + dev_set_name(pdev, "%s%d", dname, partno); device_initialize(pdev); pdev->class = &block_class; @@ -447,16 +447,11 @@ void register_disk(struct gendisk *disk) struct block_device *bdev; struct disk_part_iter piter; struct hd_struct *part; - char *s; int err; ddev->parent = disk->driverfs_dev; - strlcpy(ddev->bus_id, disk->disk_name, BUS_ID_SIZE); - /* ewww... some of these buggers have / in the name... */ - s = strchr(ddev->bus_id, '/'); - if (s) - *s = '!'; + dev_set_name(ddev, disk->disk_name); /* delay uevents, until we scanned partition table */ ddev->uevent_suppress = 1; |