1 files changed, 15 insertions, 9 deletions

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 3d73d94d93a7..22d38ffc9ef0 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -358,14 +358,13 @@ void delete_partition(struct gendisk *disk, int part)
         p->ios[0] = p->ios[1] = 0;
         p->sectors[0] = p->sectors[1] = 0;
         sysfs_remove_link(&p->kobj, "subsystem");
-        if (p->holder_dir)
-                kobject_unregister(p->holder_dir);
+        kobject_unregister(p->holder_dir);
         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)
+void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len, int flags)
 {
         struct hd_struct *p;
 
@@ -390,6 +389,15 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
         if (!disk->part_uevent_suppress)
                 kobject_uevent(&p->kobj, KOBJ_ADD);
         sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem");
+        if (flags & ADDPART_FLAG_WHOLEDISK) {
+                static struct attribute addpartattr = {
+                        .name = "whole_disk",
+                        .mode = S_IRUSR | S_IRGRP | S_IROTH,
+                        .owner = THIS_MODULE,
+                };
+
+                sysfs_create_file(&p->kobj, &addpartattr);
+        }
         partition_sysfs_add_subdir(p);
         disk->part[part-1] = p;
 }
@@ -543,9 +551,9 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
                         printk(" %s: p%d exceeds device capacity\n",
                                 disk->disk_name, p);
                 }
-                add_partition(disk, p, from, size);
+                add_partition(disk, p, from, size, state->parts[p].flags);
 #ifdef CONFIG_BLK_DEV_MD
-                if (state->parts[p].flags)
+                if (state->parts[p].flags & ADDPART_FLAG_RAID)
                         md_autodetect_dev(bdev->bd_dev+p);
 #endif
         }
@@ -594,10 +602,8 @@ void del_gendisk(struct gendisk *disk)
         disk->stamp = 0;
 
         kobject_uevent(&disk->kobj, KOBJ_REMOVE);
-        if (disk->holder_dir)
-                kobject_unregister(disk->holder_dir);
-        if (disk->slave_dir)
-                kobject_unregister(disk->slave_dir);
+        kobject_unregister(disk->holder_dir);
+        kobject_unregister(disk->slave_dir);
         if (disk->driverfs_dev) {
                 char *disk_name = make_block_name(disk);
                 sysfs_remove_link(&disk->kobj, "device");