block: Deprecate the use of the term sector in the context of block integrity

[mirror_ubuntu-bionic-kernel.git] / block / blk-integrity.c

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 7fbab84399e6c9c602c52c8157596535a2ce2e05..3a83a7d0817799ff1d85ab842c113c99256a9988 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -154,10 +154,10 @@ int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)
        if (!b1 || !b2)
                return -1;
 
-       if (b1->sector_size != b2->sector_size) {
-               printk(KERN_ERR "%s: %s/%s sector sz %u != %u\n", __func__,
-                      gd1->disk_name, gd2->disk_name,
-                      b1->sector_size, b2->sector_size);
+       if (b1->interval != b2->interval) {
+               pr_err("%s: %s/%s protection interval %u != %u\n",
+                      __func__, gd1->disk_name, gd2->disk_name,
+                      b1->interval, b2->interval);
                return -1;
        }
 
@@ -407,7 +407,7 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
                kobject_uevent(&bi->kobj, KOBJ_ADD);
 
                bi->flags |= INTEGRITY_FLAG_READ | INTEGRITY_FLAG_WRITE;
-               bi->sector_size = queue_logical_block_size(disk->queue);
+               bi->interval = queue_logical_block_size(disk->queue);
                disk->integrity = bi;
        } else
                bi = disk->integrity;
@@ -418,8 +418,6 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
                bi->generate_fn = template->generate_fn;
                bi->verify_fn = template->verify_fn;
                bi->tuple_size = template->tuple_size;
-               bi->set_tag_fn = template->set_tag_fn;
-               bi->get_tag_fn = template->get_tag_fn;
                bi->tag_size = template->tag_size;
        } else
                bi->name = bi_unsupported_name;