block: Consolidate static integrity profile properties

[firefly-linux-kernel-4.4.55.git] / block / blk-integrity.c

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index f548b64be09242a77f7db6ac7cedd5f68ee397b7..daf590ab3b4600c216d7ad6829ef953ee99c6867 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -176,10 +176,10 @@ int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)
                return -1;
        }
 
-       if (strcmp(b1->name, b2->name)) {
+       if (b1->profile != b2->profile) {
                printk(KERN_ERR "%s: %s/%s type %s != %s\n", __func__,
                       gd1->disk_name, gd2->disk_name,
-                      b1->name, b2->name);
+                      b1->profile->name, b2->profile->name);
                return -1;
        }
 
@@ -204,6 +204,9 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,
            q->limits.max_integrity_segments)
                return false;
 
+       if (integrity_req_gap_back_merge(req, next->bio))
+               return false;
+
        return true;
 }
 EXPORT_SYMBOL(blk_integrity_merge_rq);
@@ -246,8 +249,8 @@ struct integrity_sysfs_entry {
 static ssize_t integrity_attr_show(struct kobject *kobj, struct attribute *attr,
                                   char *page)
 {
-       struct blk_integrity *bi =
-               container_of(kobj, struct blk_integrity, kobj);
+       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
+       struct blk_integrity *bi = blk_get_integrity(disk);
        struct integrity_sysfs_entry *entry =
                container_of(attr, struct integrity_sysfs_entry, attr);
 
@@ -258,8 +261,8 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
                                    struct attribute *attr, const char *page,
                                    size_t count)
 {
-       struct blk_integrity *bi =
-               container_of(kobj, struct blk_integrity, kobj);
+       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
+       struct blk_integrity *bi = blk_get_integrity(disk);
        struct integrity_sysfs_entry *entry =
                container_of(attr, struct integrity_sysfs_entry, attr);
        ssize_t ret = 0;
@@ -272,8 +275,8 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
 
 static ssize_t integrity_format_show(struct blk_integrity *bi, char *page)
 {
-       if (bi != NULL && bi->name != NULL)
-               return sprintf(page, "%s\n", bi->name);
+       if (bi != NULL && bi->profile->name != NULL)
+               return sprintf(page, "%s\n", bi->profile->name);
        else
                return sprintf(page, "none\n");
 }
@@ -382,8 +385,8 @@ subsys_initcall(blk_dev_integrity_init);
 
 static void blk_integrity_release(struct kobject *kobj)
 {
-       struct blk_integrity *bi =
-               container_of(kobj, struct blk_integrity, kobj);
+       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
+       struct blk_integrity *bi = blk_get_integrity(disk);
 
        kmem_cache_free(integrity_cachep, bi);
 }
@@ -398,7 +401,8 @@ bool blk_integrity_is_initialized(struct gendisk *disk)
 {
        struct blk_integrity *bi = blk_get_integrity(disk);
 
-       return (bi && bi->name && strcmp(bi->name, bi_unsupported_name) != 0);
+       return (bi && bi->profile->name && strcmp(bi->profile->name,
+                                                 bi_unsupported_name) != 0);
 }
 EXPORT_SYMBOL(blk_integrity_is_initialized);
 
@@ -426,14 +430,14 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
                if (!bi)
                        return -1;
 
-               if (kobject_init_and_add(&bi->kobj, &integrity_ktype,
+               if (kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
                                         &disk_to_dev(disk)->kobj,
                                         "%s", "integrity")) {
                        kmem_cache_free(integrity_cachep, bi);
                        return -1;
                }
 
-               kobject_uevent(&bi->kobj, KOBJ_ADD);
+               kobject_uevent(&disk->integrity_kobj, KOBJ_ADD);
 
                bi->flags |= BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE;
                bi->interval = queue_logical_block_size(disk->queue);
@@ -443,14 +447,12 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
 
        /* Use the provided profile as template */
        if (template != NULL) {
-               bi->name = template->name;
-               bi->generate_fn = template->generate_fn;
-               bi->verify_fn = template->verify_fn;
+               bi->profile = template->profile;
                bi->tuple_size = template->tuple_size;
                bi->tag_size = template->tag_size;
                bi->flags |= template->flags;
        } else
-               bi->name = bi_unsupported_name;
+               bi->profile->name = bi_unsupported_name;
 
        disk->queue->backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES;
 
@@ -476,9 +478,9 @@ void blk_integrity_unregister(struct gendisk *disk)
 
        bi = disk->integrity;
 
-       kobject_uevent(&bi->kobj, KOBJ_REMOVE);
-       kobject_del(&bi->kobj);
-       kobject_put(&bi->kobj);
+       kobject_uevent(&disk->integrity_kobj, KOBJ_REMOVE);
+       kobject_del(&disk->integrity_kobj);
+       kobject_put(&disk->integrity_kobj);
        disk->integrity = NULL;
 }
 EXPORT_SYMBOL(blk_integrity_unregister);