projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-4.14/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
md
/
dm-thin.c
diff --git
a/drivers/md/dm-thin.c
b/drivers/md/dm-thin.c
index
9736621
..
1e25705
100644
(file)
--- a/
drivers/md/dm-thin.c
+++ b/
drivers/md/dm-thin.c
@@
-679,7
+679,7
@@
static void remap(struct thin_c *tc, struct bio *bio, dm_block_t block)
struct pool *pool = tc->pool;
sector_t bi_sector = bio->bi_iter.bi_sector;
struct pool *pool = tc->pool;
sector_t bi_sector = bio->bi_iter.bi_sector;
- bio
->bi_bdev = tc->pool_dev->bdev
;
+ bio
_set_dev(bio, tc->pool_dev->bdev)
;
if (block_size_is_power_of_two(pool))
bio->bi_iter.bi_sector =
(block << pool->sectors_per_block_shift) |
if (block_size_is_power_of_two(pool))
bio->bi_iter.bi_sector =
(block << pool->sectors_per_block_shift) |
@@
-691,7
+691,7
@@
static void remap(struct thin_c *tc, struct bio *bio, dm_block_t block)
static void remap_to_origin(struct thin_c *tc, struct bio *bio)
{
static void remap_to_origin(struct thin_c *tc, struct bio *bio)
{
- bio
->bi_bdev = tc->origin_dev->bdev
;
+ bio
_set_dev(bio, tc->origin_dev->bdev)
;
}
static int bio_triggers_commit(struct thin_c *tc, struct bio *bio)
}
static int bio_triggers_commit(struct thin_c *tc, struct bio *bio)
@@
-3313,7
+3313,7
@@
static int pool_map(struct dm_target *ti, struct bio *bio)
* As this is a singleton target, ti->begin is always zero.
*/
spin_lock_irqsave(&pool->lock, flags);
* As this is a singleton target, ti->begin is always zero.
*/
spin_lock_irqsave(&pool->lock, flags);
- bio
->bi_bdev = pt->data_dev->bdev
;
+ bio
_set_dev(bio, pt->data_dev->bdev)
;
r = DM_MAPIO_REMAPPED;
spin_unlock_irqrestore(&pool->lock, flags);
r = DM_MAPIO_REMAPPED;
spin_unlock_irqrestore(&pool->lock, flags);