dm kcopyd: return void from dm_kcopyd_copy()
dm_kcopyd_copy() only ever returns 0 so there is no need for callers to account for possible failure. Same goes for dm_kcopyd_zero(). Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
@@ -1188,9 +1188,8 @@ static void copy_complete(int read_err, unsigned long write_err, void *context)
|
||||
queue_continuation(mg->cache->wq, &mg->k);
|
||||
}
|
||||
|
||||
static int copy(struct dm_cache_migration *mg, bool promote)
|
||||
static void copy(struct dm_cache_migration *mg, bool promote)
|
||||
{
|
||||
int r;
|
||||
struct dm_io_region o_region, c_region;
|
||||
struct cache *cache = mg->cache;
|
||||
|
||||
@@ -1203,11 +1202,9 @@ static int copy(struct dm_cache_migration *mg, bool promote)
|
||||
c_region.count = cache->sectors_per_block;
|
||||
|
||||
if (promote)
|
||||
r = dm_kcopyd_copy(cache->copier, &o_region, 1, &c_region, 0, copy_complete, &mg->k);
|
||||
dm_kcopyd_copy(cache->copier, &o_region, 1, &c_region, 0, copy_complete, &mg->k);
|
||||
else
|
||||
r = dm_kcopyd_copy(cache->copier, &c_region, 1, &o_region, 0, copy_complete, &mg->k);
|
||||
|
||||
return r;
|
||||
dm_kcopyd_copy(cache->copier, &c_region, 1, &o_region, 0, copy_complete, &mg->k);
|
||||
}
|
||||
|
||||
static void bio_drop_shared_lock(struct cache *cache, struct bio *bio)
|
||||
@@ -1449,12 +1446,7 @@ static void mg_full_copy(struct work_struct *ws)
|
||||
}
|
||||
|
||||
init_continuation(&mg->k, mg_upgrade_lock);
|
||||
|
||||
if (copy(mg, is_policy_promote)) {
|
||||
DMERR_LIMIT("%s: migration copy failed", cache_device_name(cache));
|
||||
mg->k.input = BLK_STS_IOERR;
|
||||
mg_complete(mg, false);
|
||||
}
|
||||
copy(mg, is_policy_promote);
|
||||
}
|
||||
|
||||
static void mg_copy(struct work_struct *ws)
|
||||
|
Reference in New Issue
Block a user