diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-05-14 17:28:37 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 20:18:58 +0200 |
| commit | f8ae75253e4174089ffe3046715c679183f1919f (patch) | |
| tree | 695b60f3852383e28d162bdc33b78637e2cac39b /drivers/md/dm-thin.c | |
| parent | dm thin: cleanup overwrite's endio restore to be centralized (diff) | |
| download | linux-f8ae75253e4174089ffe3046715c679183f1919f.tar.xz linux-f8ae75253e4174089ffe3046715c679183f1919f.zip | |
dm thin: cleanup schedule_zero() to read more logically
The overwrite has only ever about optimizing away the need to zero a
block if the entire block was being overwritten. As such it is only
relevant when zeroing is enabled.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Joe Thornber <ejt@redhat.com>
Diffstat (limited to 'drivers/md/dm-thin.c')
| -rw-r--r-- | drivers/md/dm-thin.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index c0fbb6c306b2..c552df7b3420 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -1086,16 +1086,14 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block, * zeroing pre-existing data, we can issue the bio immediately. * Otherwise we use kcopyd to zero the data first. */ - if (!pool->pf.zero_new_blocks) + if (pool->pf.zero_new_blocks) { + if (io_overwrites_block(pool, bio)) + remap_and_issue_overwrite(tc, bio, data_block, m); + else + ll_zero(tc, m, data_block * pool->sectors_per_block, + (data_block + 1) * pool->sectors_per_block); + } else process_prepared_mapping(m); - - else if (io_overwrites_block(pool, bio)) - remap_and_issue_overwrite(tc, bio, data_block, m); - - else - ll_zero(tc, m, - data_block * pool->sectors_per_block, - (data_block + 1) * pool->sectors_per_block); } static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block, |