ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE

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

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 7fbab84..79ffb48 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;
        }
 
@@ -186,37 +186,53 @@ int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)
 }
 EXPORT_SYMBOL(blk_integrity_compare);
 
-int blk_integrity_merge_rq(struct request_queue *q, struct request *req,
-                          struct request *next)
+bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,
+                           struct request *next)
 {
-       if (blk_integrity_rq(req) != blk_integrity_rq(next))
-               return -1;
+       if (blk_integrity_rq(req) == 0 && blk_integrity_rq(next) == 0)
+               return true;
+
+       if (blk_integrity_rq(req) == 0 || blk_integrity_rq(next) == 0)
+               return false;
+
+       if (bio_integrity(req->bio)->bip_flags !=
+           bio_integrity(next->bio)->bip_flags)
+               return false;
 
        if (req->nr_integrity_segments + next->nr_integrity_segments >
            q->limits.max_integrity_segments)
-               return -1;
+               return false;
 
-       return 0;
+       return true;
 }
 EXPORT_SYMBOL(blk_integrity_merge_rq);
 
-int blk_integrity_merge_bio(struct request_queue *q, struct request *req,
-                           struct bio *bio)
+bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
+                            struct bio *bio)
 {
        int nr_integrity_segs;
        struct bio *next = bio->bi_next;
 
+       if (blk_integrity_rq(req) == 0 && bio_integrity(bio) == NULL)
+               return true;
+
+       if (blk_integrity_rq(req) == 0 || bio_integrity(bio) == NULL)
+               return false;
+
+       if (bio_integrity(req->bio)->bip_flags != bio_integrity(bio)->bip_flags)
+               return false;
+
        bio->bi_next = NULL;
        nr_integrity_segs = blk_rq_count_integrity_sg(q, bio);
        bio->bi_next = next;
 
        if (req->nr_integrity_segments + nr_integrity_segs >
            q->limits.max_integrity_segments)
-               return -1;
+               return false;
 
        req->nr_integrity_segments += nr_integrity_segs;
 
-       return 0;
+       return true;
 }
 EXPORT_SYMBOL(blk_integrity_merge_bio);
 
@@ -269,42 +285,48 @@ static ssize_t integrity_tag_size_show(struct blk_integrity *bi, char *page)
                return sprintf(page, "0\n");
 }
 
-static ssize_t integrity_read_store(struct blk_integrity *bi,
-                                   const char *page, size_t count)
+static ssize_t integrity_verify_store(struct blk_integrity *bi,
+                                     const char *page, size_t count)
 {
        char *p = (char *) page;
        unsigned long val = simple_strtoul(p, &p, 10);
 
        if (val)
-               bi->flags |= INTEGRITY_FLAG_READ;
+               bi->flags |= BLK_INTEGRITY_VERIFY;
        else
-               bi->flags &= ~INTEGRITY_FLAG_READ;
+               bi->flags &= ~BLK_INTEGRITY_VERIFY;
 
        return count;
 }
 
-static ssize_t integrity_read_show(struct blk_integrity *bi, char *page)
+static ssize_t integrity_verify_show(struct blk_integrity *bi, char *page)
 {
-       return sprintf(page, "%d\n", (bi->flags & INTEGRITY_FLAG_READ) != 0);
+       return sprintf(page, "%d\n", (bi->flags & BLK_INTEGRITY_VERIFY) != 0);
 }
 
-static ssize_t integrity_write_store(struct blk_integrity *bi,
-                                    const char *page, size_t count)
+static ssize_t integrity_generate_store(struct blk_integrity *bi,
+                                       const char *page, size_t count)
 {
        char *p = (char *) page;
        unsigned long val = simple_strtoul(p, &p, 10);
 
        if (val)
-               bi->flags |= INTEGRITY_FLAG_WRITE;
+               bi->flags |= BLK_INTEGRITY_GENERATE;
        else
-               bi->flags &= ~INTEGRITY_FLAG_WRITE;
+               bi->flags &= ~BLK_INTEGRITY_GENERATE;
 
        return count;
 }
 
-static ssize_t integrity_write_show(struct blk_integrity *bi, char *page)
+static ssize_t integrity_generate_show(struct blk_integrity *bi, char *page)
+{
+       return sprintf(page, "%d\n", (bi->flags & BLK_INTEGRITY_GENERATE) != 0);
+}
+
+static ssize_t integrity_device_show(struct blk_integrity *bi, char *page)
 {
-       return sprintf(page, "%d\n", (bi->flags & INTEGRITY_FLAG_WRITE) != 0);
+       return sprintf(page, "%u\n",
+                      (bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE) != 0);
 }
 
 static struct integrity_sysfs_entry integrity_format_entry = {
@@ -317,23 +339,29 @@ static struct integrity_sysfs_entry integrity_tag_size_entry = {
        .show = integrity_tag_size_show,
 };
 
-static struct integrity_sysfs_entry integrity_read_entry = {
+static struct integrity_sysfs_entry integrity_verify_entry = {
        .attr = { .name = "read_verify", .mode = S_IRUGO | S_IWUSR },
-       .show = integrity_read_show,
-       .store = integrity_read_store,
+       .show = integrity_verify_show,
+       .store = integrity_verify_store,
 };
 
-static struct integrity_sysfs_entry integrity_write_entry = {
+static struct integrity_sysfs_entry integrity_generate_entry = {
        .attr = { .name = "write_generate", .mode = S_IRUGO | S_IWUSR },
-       .show = integrity_write_show,
-       .store = integrity_write_store,
+       .show = integrity_generate_show,
+       .store = integrity_generate_store,
+};
+
+static struct integrity_sysfs_entry integrity_device_entry = {
+       .attr = { .name = "device_is_integrity_capable", .mode = S_IRUGO },
+       .show = integrity_device_show,
 };
 
 static struct attribute *integrity_attrs[] = {
        &integrity_format_entry.attr,
        &integrity_tag_size_entry.attr,
-       &integrity_read_entry.attr,
-       &integrity_write_entry.attr,
+       &integrity_verify_entry.attr,
+       &integrity_generate_entry.attr,
+       &integrity_device_entry.attr,
        NULL,
 };
 
@@ -406,8 +434,8 @@ 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->flags |= BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE;
+               bi->interval = queue_logical_block_size(disk->queue);
                disk->integrity = bi;
        } else
                bi = disk->integrity;
@@ -418,9 +446,8 @@ 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;
+               bi->flags |= template->flags;
        } else
                bi->name = bi_unsupported_name;