2 files changed, 10 insertions, 5 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 85df45292dba..0c706f33a599 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1284,7 +1284,11 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
                  * converted to make use of bd_mutex and sequence counters.
                  */
                 seqcount_init(&disk->part0.nr_sects_seq);
-                hd_ref_init(&disk->part0);
+                if (hd_ref_init(&disk->part0)) {
+                        hd_free_part(&disk->part0);
+                        kfree(disk);
+                        return NULL;
+                }
 
                 disk->minors = minors;
                 rand_initialize_disk(disk);
diff --git a/block/partition-generic.c b/block/partition-generic.c
index eca0d02a607c..e7711133284e 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -232,8 +232,9 @@ static void delete_partition_rcu_cb(struct rcu_head *head)
         put_device(part_to_dev(part));
 }
 
-void __delete_partition(struct hd_struct *part)
+void __delete_partition(struct percpu_ref *ref)
 {
+        struct hd_struct *part = container_of(ref, struct hd_struct, ref);
         call_rcu(&part->rcu_head, delete_partition_rcu_cb);
 }
 
@@ -254,7 +255,7 @@ void delete_partition(struct gendisk *disk, int partno)
         kobject_put(part->holder_dir);
         device_del(part_to_dev(part));
 
-        hd_struct_put(part);
+        hd_struct_kill(part);
 }
 
 static ssize_t whole_disk_show(struct device *dev,
@@ -355,8 +356,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
         if (!dev_get_uevent_suppress(ddev))
                 kobject_uevent(&pdev->kobj, KOBJ_ADD);
 
-        hd_ref_init(p);
-        return p;
+        if (!hd_ref_init(p))
+                return p;
 
 out_free_info:
         free_part_info(p);