upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index b41bf77..2cab98a 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -73,6 +73,9 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
 #ifdef CONFIG_EFI_PARTITION
        efi_partition,          /* this must come before msdos */
 #endif
+#ifdef CONFIG_SGI_PARTITION
+       sgi_partition,
+#endif
 #ifdef CONFIG_LDM_PARTITION
        ldm_partition,          /* this must come before msdos */
 #endif
@@ -97,9 +100,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
 #ifdef CONFIG_MAC_PARTITION
        mac_partition,
 #endif
-#ifdef CONFIG_SGI_PARTITION
-       sgi_partition,
-#endif
 #ifdef CONFIG_ULTRIX_PARTITION
        ultrix_partition,
 #endif
@@ -337,6 +337,7 @@ void register_disk(struct gendisk *disk)
        if ((err = kobject_add(&disk->kobj)))
                return;
        disk_sysfs_symlinks(disk);
+       kobject_hotplug(&disk->kobj, KOBJ_ADD);
 
        /* No minors to use for partitions */
        if (disk->minors == 1) {
@@ -441,5 +442,6 @@ void del_gendisk(struct gendisk *disk)
                sysfs_remove_link(&disk->driverfs_dev->kobj, "block");
                put_device(disk->driverfs_dev);
        }
+       kobject_hotplug(&disk->kobj, KOBJ_REMOVE);
        kobject_del(&disk->kobj);
 }