1 files changed, 17 insertions, 16 deletions

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 3f1a8478cc38..61a8e2f8fdd0 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -108,51 +108,51 @@ new_segment:
 EXPORT_SYMBOL(blk_rq_map_integrity_sg);
 
 /**
- * blk_integrity_compare - Compare integrity profile of two block devices
- * @b1:         Device to compare
- * @b2:         Device to compare
+ * blk_integrity_compare - Compare integrity profile of two disks
+ * @gd1:        Disk to compare
+ * @gd2:        Disk to compare
  *
  * Description: Meta-devices like DM and MD need to verify that all
  * sub-devices use the same integrity format before advertising to
  * upper layers that they can send/receive integrity metadata.  This
- * function can be used to check whether two block devices have
+ * function can be used to check whether two gendisk devices have
  * compatible integrity formats.
  */
-int blk_integrity_compare(struct block_device *bd1, struct block_device *bd2)
+int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)
 {
-        struct blk_integrity *b1 = bd1->bd_disk->integrity;
-        struct blk_integrity *b2 = bd2->bd_disk->integrity;
+        struct blk_integrity *b1 = gd1->integrity;
+        struct blk_integrity *b2 = gd2->integrity;
 
-        BUG_ON(bd1->bd_disk == NULL);
-        BUG_ON(bd2->bd_disk == NULL);
+        if (!b1 && !b2)
+                return 0;
 
         if (!b1 || !b2)
-                return 0;
+                return -1;
 
         if (b1->sector_size != b2->sector_size) {
                 printk(KERN_ERR "%s: %s/%s sector sz %u != %u\n", __func__,
-                       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,
+                       gd1->disk_name, gd2->disk_name,
                        b1->sector_size, b2->sector_size);
                 return -1;
         }
 
         if (b1->tuple_size != b2->tuple_size) {
                 printk(KERN_ERR "%s: %s/%s tuple sz %u != %u\n", __func__,
-                       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,
+                       gd1->disk_name, gd2->disk_name,
                        b1->tuple_size, b2->tuple_size);
                 return -1;
         }
 
         if (b1->tag_size && b2->tag_size && (b1->tag_size != b2->tag_size)) {
                 printk(KERN_ERR "%s: %s/%s tag sz %u != %u\n", __func__,
-                       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,
+                       gd1->disk_name, gd2->disk_name,
                        b1->tag_size, b2->tag_size);
                 return -1;
         }
 
         if (strcmp(b1->name, b2->name)) {
                 printk(KERN_ERR "%s: %s/%s type %s != %s\n", __func__,
-                       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,
+                       gd1->disk_name, gd2->disk_name,
                        b1->name, b2->name);
                 return -1;
         }
@@ -331,7 +331,8 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
                         return -1;
 
                 if (kobject_init_and_add(&bi->kobj, &integrity_ktype,
-                                         &disk->dev.kobj, "%s", "integrity")) {
+                                         &disk_to_dev(disk)->kobj,
+                                         "%s", "integrity")) {
                         kmem_cache_free(integrity_cachep, bi);
                         return -1;
                 }
@@ -375,7 +376,7 @@ void blk_integrity_unregister(struct gendisk *disk)
 
         kobject_uevent(&bi->kobj, KOBJ_REMOVE);
         kobject_del(&bi->kobj);
-        kobject_put(&disk->dev.kobj);
         kmem_cache_free(integrity_cachep, bi);
+        disk->integrity = NULL;
 }
 EXPORT_SYMBOL(blk_integrity_unregister);