Skip to content

Commit

Permalink
dm-verity: remove the unused "data_start" variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mikulas Patocka committed Nov 20, 2024
1 parent 61a5725 commit a573e40
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/md/dm-verity-target.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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;
}
Expand All @@ -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)
Expand Down
1 change: 0 additions & 1 deletion drivers/md/dm-verity.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit a573e40

Please sign in to comment.