Commit cc7a7fb3 authored by Bryan Gurney's avatar Bryan Gurney Committed by Mike Snitzer
Browse files

dm dust: change ret to r in dust_map_read and dust_map 



In the dust_map_read() and dust_map() functions, change the
return code variable "ret" to "r", to match the convention of the
other device-mapper targets.

Signed-off-by: default avatarBryan Gurney <bgurney@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 6ec1be50

drivers/md/dm-dust.c

+7 −7
Original line number Diff line number Diff line
@@ -163,16 +163,16 @@ static int dust_map_read(struct dust_device *dd, sector_t thisblock, 
			 bool fail_read_on_bb)

{

	unsigned long flags;

	int ret = DM_MAPIO_REMAPPED;

	int r = DM_MAPIO_REMAPPED;



	if (fail_read_on_bb) {

		thisblock >>= dd->sect_per_block_shift;

		spin_lock_irqsave(&dd->dust_lock, flags);

		ret = __dust_map_read(dd, thisblock);

		r = __dust_map_read(dd, thisblock);

		spin_unlock_irqrestore(&dd->dust_lock, flags);

	}



	return ret;

	return r;

}



static void __dust_map_write(struct dust_device *dd, sector_t thisblock)
@@ -209,17 +209,17 @@ static int dust_map_write(struct dust_device *dd, sector_t thisblock, 
static int dust_map(struct dm_target *ti, struct bio *bio)

{

	struct dust_device *dd = ti->private;

	int ret;

	int r;



	bio_set_dev(bio, dd->dev->bdev);

	bio->bi_iter.bi_sector = dd->start + dm_target_offset(ti, bio->bi_iter.bi_sector);



	if (bio_data_dir(bio) == READ)

		ret = dust_map_read(dd, bio->bi_iter.bi_sector, dd->fail_read_on_bb);

		r = dust_map_read(dd, bio->bi_iter.bi_sector, dd->fail_read_on_bb);

	else

		ret = dust_map_write(dd, bio->bi_iter.bi_sector, dd->fail_read_on_bb);

		r = dust_map_write(dd, bio->bi_iter.bi_sector, dd->fail_read_on_bb);



	return ret;

	return r;

}



static bool __dust_clear_badblocks(struct rb_root *tree,

CRA Git | Maintained and supported by SUSTech CRA and CCSE