openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Bryan Gurney <bgurney@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Bryan Gurney 2019-10-04 11:42:09 -04:00 committed by Mike Snitzer
parent 6ec1be5015
commit cc7a7fb3b6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/md/dm-dust.c
View File

@ -163,16 +163,16 @@ static int dust_map_read(struct dust_device *dd, sector_t thisblock,
bool fail_read_on_bb) bool fail_read_on_bb)
{ {
unsigned long flags; unsigned long flags;
int ret = DM_MAPIO_REMAPPED; int r = DM_MAPIO_REMAPPED;
if (fail_read_on_bb) { if (fail_read_on_bb) {
thisblock >>= dd->sect_per_block_shift; thisblock >>= dd->sect_per_block_shift;
spin_lock_irqsave(&dd->dust_lock, flags); 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); spin_unlock_irqrestore(&dd->dust_lock, flags);
} }
return ret; return r;
} }
static void __dust_map_write(struct dust_device *dd, sector_t thisblock) 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) static int dust_map(struct dm_target *ti, struct bio *bio)
{ {
struct dust_device *dd = ti->private; struct dust_device *dd = ti->private;
int ret; int r;
bio_set_dev(bio, dd->dev->bdev); bio_set_dev(bio, dd->dev->bdev);
bio->bi_iter.bi_sector = dd->start + dm_target_offset(ti, bio->bi_iter.bi_sector); bio->bi_iter.bi_sector = dd->start + dm_target_offset(ti, bio->bi_iter.bi_sector);
if (bio_data_dir(bio) == READ) 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 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, static bool __dust_clear_badblocks(struct rb_root *tree,