diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2019-01-16 18:53:26 -0500 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2019-01-21 11:29:18 -0500 |
| commit | 57c36519e4b949f89381053f7283f5d605595b42 (patch) | |
| tree | e2422cb8eae102acf99b4a0460e716bb6bcf002e /drivers/md/dm.c | |
| parent | d445bd9cec1a850c2100fcf53684c13b3fd934f2 (diff) | |
| download | lwn-57c36519e4b949f89381053f7283f5d605595b42.tar.gz lwn-57c36519e4b949f89381053f7283f5d605595b42.zip | |
dm: fix clone_bio() to trigger blk_recount_segments()
DM's clone_bio() now benefits from using bio_trim() by fixing the fact
that clone_bio() wasn't clearing BIO_SEG_VALID like bio_trim() does;
which triggers blk_recount_segments() via bio_phys_segments().
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index d67c95ef8d7e..fcb97b0a5743 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1320,7 +1320,7 @@ static int clone_bio(struct dm_target_io *tio, struct bio *bio, __bio_clone_fast(clone, bio); - if (unlikely(bio_integrity(bio) != NULL)) { + if (bio_integrity(bio)) { int r; if (unlikely(!dm_target_has_integrity(tio->ti->type) && @@ -1336,11 +1336,7 @@ static int clone_bio(struct dm_target_io *tio, struct bio *bio, return r; } - bio_advance(clone, to_bytes(sector - clone->bi_iter.bi_sector)); - clone->bi_iter.bi_size = to_bytes(len); - - if (unlikely(bio_integrity(bio) != NULL)) - bio_integrity_trim(clone); + bio_trim(clone, sector - clone->bi_iter.bi_sector, len); return 0; } |