Merge tag 'for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[linux-2.6-block.git] / block / blk-integrity.c

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 4615a3386798538fd7ce152057bdf60eb4f25986..d69c5c79f98e71059827265531aba75a63458f74 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -142,8 +142,8 @@ EXPORT_SYMBOL(blk_rq_map_integrity_sg);
  */
 int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)
 {
-       struct blk_integrity *b1 = &gd1->integrity;
-       struct blk_integrity *b2 = &gd2->integrity;
+       struct blk_integrity *b1 = &gd1->queue->integrity;
+       struct blk_integrity *b2 = &gd2->queue->integrity;
 
        if (!b1->profile && !b2->profile)
                return 0;
@@ -246,7 +246,7 @@ static ssize_t integrity_attr_show(struct kobject *kobj, struct attribute *attr,
                                   char *page)
 {
        struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct blk_integrity *bi = &disk->integrity;
+       struct blk_integrity *bi = &disk->queue->integrity;
        struct integrity_sysfs_entry *entry =
                container_of(attr, struct integrity_sysfs_entry, attr);
 
@@ -258,7 +258,7 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
                                    size_t count)
 {
        struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct blk_integrity *bi = &disk->integrity;
+       struct blk_integrity *bi = &disk->queue->integrity;
        struct integrity_sysfs_entry *entry =
                container_of(attr, struct integrity_sysfs_entry, attr);
        ssize_t ret = 0;
@@ -384,6 +384,17 @@ static struct kobj_type integrity_ktype = {
        .sysfs_ops      = &integrity_ops,
 };
 
+static int blk_integrity_nop_fn(struct blk_integrity_iter *iter)
+{
+       return 0;
+}
+
+static struct blk_integrity_profile nop_profile = {
+       .name = "nop",
+       .generate_fn = blk_integrity_nop_fn,
+       .verify_fn = blk_integrity_nop_fn,
+};
+
 /**
  * blk_integrity_register - Register a gendisk as being integrity-capable
  * @disk:      struct gendisk pointer to make integrity-aware
@@ -397,12 +408,12 @@ static struct kobj_type integrity_ktype = {
  */
 void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
 {
-       struct blk_integrity *bi = &disk->integrity;
+       struct blk_integrity *bi = &disk->queue->integrity;
 
        bi->flags = BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE |
                template->flags;
        bi->interval_exp = ilog2(queue_logical_block_size(disk->queue));
-       bi->profile = template->profile;
+       bi->profile = template->profile ? template->profile : &nop_profile;
        bi->tuple_size = template->tuple_size;
        bi->tag_size = template->tag_size;
 
@@ -420,13 +431,13 @@ EXPORT_SYMBOL(blk_integrity_register);
 void blk_integrity_unregister(struct gendisk *disk)
 {
        blk_integrity_revalidate(disk);
-       memset(&disk->integrity, 0, sizeof(struct blk_integrity));
+       memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));
 }
 EXPORT_SYMBOL(blk_integrity_unregister);
 
 void blk_integrity_revalidate(struct gendisk *disk)
 {
-       struct blk_integrity *bi = &disk->integrity;
+       struct blk_integrity *bi = &disk->queue->integrity;
 
        if (!(disk->flags & GENHD_FL_UP))
                return;