1 files changed, 37 insertions, 9 deletions

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index af0cb4b9e784..7ef1f094de91 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -331,7 +331,9 @@ void delete_partition(struct gendisk *disk, int part)
         devfs_remove("%s/part%d", disk->devfs_name, part);
         if (p->holder_dir)
                 kobject_unregister(p->holder_dir);
-        kobject_unregister(&p->kobj);
+        kobject_uevent(&p->kobj, KOBJ_REMOVE);
+        kobject_del(&p->kobj);
+        kobject_put(&p->kobj);
 }
 
 void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
@@ -357,7 +359,10 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
                 snprintf(p->kobj.name,KOBJ_NAME_LEN,"%s%d",disk->kobj.name,part);
         p->kobj.parent = &disk->kobj;
         p->kobj.ktype = &ktype_part;
-        kobject_register(&p->kobj);
+        kobject_init(&p->kobj);
+        kobject_add(&p->kobj);
+        if (!disk->part_uevent_suppress)
+                kobject_uevent(&p->kobj, KOBJ_ADD);
         partition_sysfs_add_subdir(p);
         disk->part[part-1] = p;
 }
@@ -367,6 +372,7 @@ static char *make_block_name(struct gendisk *disk)
         char *name;
         static char *block_str = "block:";
         int size;
+        char *s;
 
         size = strlen(block_str) + strlen(disk->disk_name) + 1;
         name = kmalloc(size, GFP_KERNEL);
@@ -374,6 +380,10 @@ static char *make_block_name(struct gendisk *disk)
                 return NULL;
         strcpy(name, block_str);
         strcat(name, disk->disk_name);
+        /* ewww... some of these buggers have / in name... */
+        s = strchr(name, '/');
+        if (s)
+                *s = '!';
         return name;
 }
 
@@ -395,6 +405,8 @@ void register_disk(struct gendisk *disk)
 {
         struct block_device *bdev;
         char *s;
+        int i;
+        struct hd_struct *p;
         int err;
 
         strlcpy(disk->kobj.name,disk->disk_name,KOBJ_NAME_LEN);
@@ -406,13 +418,12 @@ void register_disk(struct gendisk *disk)
                 return;
         disk_sysfs_symlinks(disk);
         disk_sysfs_add_subdirs(disk);
-        kobject_uevent(&disk->kobj, KOBJ_ADD);
 
         /* No minors to use for partitions */
         if (disk->minors == 1) {
                 if (disk->devfs_name[0] != '\0')
                         devfs_add_disk(disk);
-                return;
+                goto exit;
         }
 
         /* always add handle for the whole disk */
@@ -420,16 +431,32 @@ void register_disk(struct gendisk *disk)
 
         /* No such device (e.g., media were just removed) */
         if (!get_capacity(disk))
-                return;
+                goto exit;
 
         bdev = bdget_disk(disk, 0);
         if (!bdev)
-                return;
+                goto exit;
 
+        /* scan partition table, but suppress uevents */
         bdev->bd_invalidated = 1;
-        if (blkdev_get(bdev, FMODE_READ, 0) < 0)
-                return;
+        disk->part_uevent_suppress = 1;
+        err = blkdev_get(bdev, FMODE_READ, 0);
+        disk->part_uevent_suppress = 0;
+        if (err < 0)
+                goto exit;
         blkdev_put(bdev);
+
+exit:
+        /* announce disk after possible partitions are already created */
+        kobject_uevent(&disk->kobj, KOBJ_ADD);
+
+        /* announce possible partitions */
+        for (i = 1; i < disk->minors; i++) {
+                p = disk->part[i-1];
+                if (!p || !p->nr_sects)
+                        continue;
+                kobject_uevent(&p->kobj, KOBJ_ADD);
+        }
 }
 
 int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
@@ -506,6 +533,7 @@ void del_gendisk(struct gendisk *disk)
 
         devfs_remove_disk(disk);
 
+        kobject_uevent(&disk->kobj, KOBJ_REMOVE);
         if (disk->holder_dir)
                 kobject_unregister(disk->holder_dir);
         if (disk->slave_dir)
@@ -518,7 +546,7 @@ void del_gendisk(struct gendisk *disk)
                         kfree(disk_name);
                 }
                 put_device(disk->driverfs_dev);
+                disk->driverfs_dev = NULL;
         }
-        kobject_uevent(&disk->kobj, KOBJ_REMOVE);
         kobject_del(&disk->kobj);
 }