dm-verity: remove the unused "data_start" variable

Remove the unused "data_start" variable. It is always set to zero and the
user can't override it. If the user needs to use some existing offset
within a block device, it is possible to use the linear target.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index c142ec5458b70fe782e550ae1acfa1e45bd2a210..47d595f6a76e57e0864ac3428434aa9862b12745 100644 (file)
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -93,7 +93,7 @@ static void dm_bufio_alloc_callback(struct dm_buffer *buf)
  */
 static sector_t verity_map_sector(struct dm_verity *v, sector_t bi_sector)
 {
-       return v->data_start + dm_target_offset(v->ti, bi_sector);
+       return dm_target_offset(v->ti, bi_sector);
 }
 
 /*
@@ -952,7 +952,7 @@ static int verity_prepare_ioctl(struct dm_target *ti, struct block_device **bdev
 
        *bdev = v->data_dev->bdev;
 
-       if (v->data_start || ti->len != bdev_nr_sectors(v->data_dev->bdev))
+       if (ti->len != bdev_nr_sectors(v->data_dev->bdev))
                return 1;
        return 0;
 }
@@ -962,7 +962,7 @@ static int verity_iterate_devices(struct dm_target *ti,
 {
        struct dm_verity *v = ti->private;
 
-       return fn(ti, v->data_dev, v->data_start, ti->len, data);
+       return fn(ti, v->data_dev, 0, ti->len, data);
 }
 
 static void verity_io_hints(struct dm_target *ti, struct queue_limits *limits)

diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h
index c996140bda94db1e5ba31a0656d98c896f186639..8cbb57862ae19a5852b5828d6c9f3a37727ea649 100644 (file)
--- a/drivers/md/dm-verity.h
+++ b/drivers/md/dm-verity.h
@@ -50,7 +50,6 @@ struct dm_verity {
        unsigned int sig_size;  /* root digest signature size */
 #endif /* CONFIG_SECURITY */
        unsigned int salt_size;
-       sector_t data_start;    /* data offset in 512-byte sectors */
        sector_t hash_start;    /* hash start in blocks */
        sector_t data_blocks;   /* the number of data blocks */
        sector_t hash_blocks;   /* the number of hash blocks */