dm dust: change ret to r in dust_map_read and dust_map
authorBryan Gurney <bgurney@redhat.com>
Fri, 4 Oct 2019 15:42:09 +0000 (11:42 -0400)
committerMike Snitzer <snitzer@redhat.com>
Tue, 5 Nov 2019 19:56:08 +0000 (14:56 -0500)
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>
drivers/md/dm-dust.c

index 29626ff8b8e8d5003c388219a69eb15d660d3caa..9a926a799fb48f90afe22bb3ba025ea6a78ba0b0 100644 (file)
@@ -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,