dm: rename request variables to bios

Use 'bio' in the name of variables and functions that deal with
bios rather than 'request' to avoid confusion with the normal
block layer use of 'request'.

No functional changes.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index aaecefa63935..d8837d313f54 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -160,9 +160,9 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         if (r)
                 return r;
 
-        ti->num_flush_requests = stripes;
-        ti->num_discard_requests = stripes;
-        ti->num_write_same_requests = stripes;
+        ti->num_flush_bios = stripes;
+        ti->num_discard_bios = stripes;
+        ti->num_write_same_bios = stripes;
 
         sc->chunk_size = chunk_size;
         if (chunk_size & (chunk_size - 1))
@@ -276,19 +276,19 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
 {
         struct stripe_c *sc = ti->private;
         uint32_t stripe;
-        unsigned target_request_nr;
+        unsigned target_bio_nr;
 
         if (bio->bi_rw & REQ_FLUSH) {
-                target_request_nr = dm_bio_get_target_request_nr(bio);
-                BUG_ON(target_request_nr >= sc->stripes);
-                bio->bi_bdev = sc->stripe[target_request_nr].dev->bdev;
+                target_bio_nr = dm_bio_get_target_bio_nr(bio);
+                BUG_ON(target_bio_nr >= sc->stripes);
+                bio->bi_bdev = sc->stripe[target_bio_nr].dev->bdev;
                 return DM_MAPIO_REMAPPED;
         }
         if (unlikely(bio->bi_rw & REQ_DISCARD) ||
             unlikely(bio->bi_rw & REQ_WRITE_SAME)) {
-                target_request_nr = dm_bio_get_target_request_nr(bio);
-                BUG_ON(target_request_nr >= sc->stripes);
-                return stripe_map_range(sc, bio, target_request_nr);
+                target_bio_nr = dm_bio_get_target_bio_nr(bio);
+                BUG_ON(target_bio_nr >= sc->stripes);
+                return stripe_map_range(sc, bio, target_bio_nr);
         }
 
         stripe_map_sector(sc, bio->bi_sector, &stripe, &bio->bi_sector);