block: implement extended dev numbers

[linux-2.6-omap-h63xx.git] / fs / partitions / check.c

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index c442f0aadac32b53c3638c99475be8e7b67e0c91..0d4b7f28f13fdae3b3cacd03dedefbffb9b7921f 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -333,6 +333,7 @@ void delete_partition(struct gendisk *disk, int partno)
        if (!part)
                return;
 
+       blk_free_devt(part_devt(part));
        rcu_assign_pointer(disk->__part[partno-1], NULL);
        kobject_put(part->holder_dir);
        device_del(&part->dev);
@@ -352,6 +353,7 @@ int add_partition(struct gendisk *disk, int partno,
                  sector_t start, sector_t len, int flags)
 {
        struct hd_struct *p;
+       dev_t devt = MKDEV(0, 0);
        int err;
 
        if (disk->__part[partno - 1])
@@ -378,11 +380,15 @@ int add_partition(struct gendisk *disk, int partno,
                         "%s%d", disk->dev.bus_id, partno);
 
        device_initialize(&p->dev);
-       p->dev.devt = MKDEV(disk->major, disk->first_minor + partno);
        p->dev.class = &block_class;
        p->dev.type = &part_type;
        p->dev.parent = &disk->dev;
 
+       err = blk_alloc_devt(p, &devt);
+       if (err)
+               goto out_put;
+       p->dev.devt = devt;
+
        /* delay uevent until 'holders' subdir is created */
        p->dev.uevent_suppress = 1;
        err = device_add(&p->dev);
@@ -419,6 +425,7 @@ out_del:
        device_del(&p->dev);
 out_put:
        put_device(&p->dev);
+       blk_free_devt(devt);
        return err;
 }