diff options
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r-- | drivers/md/dm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 59bf797de9a5..952c49c3b9aa 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -50,9 +50,9 @@ struct target_io { | |||
50 | 50 | ||
51 | union map_info *dm_get_mapinfo(struct bio *bio) | 51 | union map_info *dm_get_mapinfo(struct bio *bio) |
52 | { | 52 | { |
53 | if (bio && bio->bi_private) | 53 | if (bio && bio->bi_private) |
54 | return &((struct target_io *)bio->bi_private)->info; | 54 | return &((struct target_io *)bio->bi_private)->info; |
55 | return NULL; | 55 | return NULL; |
56 | } | 56 | } |
57 | 57 | ||
58 | #define MINOR_ALLOCED ((void *)-1) | 58 | #define MINOR_ALLOCED ((void *)-1) |
@@ -474,8 +474,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone, | |||
474 | if (r > 0) { | 474 | if (r > 0) { |
475 | /* the bio has been remapped so dispatch it */ | 475 | /* the bio has been remapped so dispatch it */ |
476 | 476 | ||
477 | blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone, | 477 | blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone, |
478 | tio->io->bio->bi_bdev->bd_dev, sector, | 478 | tio->io->bio->bi_bdev->bd_dev, sector, |
479 | clone->bi_sector); | 479 | clone->bi_sector); |
480 | 480 | ||
481 | generic_make_request(clone); | 481 | generic_make_request(clone); |
@@ -1042,7 +1042,7 @@ static struct mapped_device *dm_find_md(dev_t dev) | |||
1042 | md = idr_find(&_minor_idr, minor); | 1042 | md = idr_find(&_minor_idr, minor); |
1043 | if (md && (md == MINOR_ALLOCED || | 1043 | if (md && (md == MINOR_ALLOCED || |
1044 | (dm_disk(md)->first_minor != minor) || | 1044 | (dm_disk(md)->first_minor != minor) || |
1045 | test_bit(DMF_FREEING, &md->flags))) { | 1045 | test_bit(DMF_FREEING, &md->flags))) { |
1046 | md = NULL; | 1046 | md = NULL; |
1047 | goto out; | 1047 | goto out; |
1048 | } | 1048 | } |