diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 13:41:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 13:41:09 -0400 |
| commit | 2027bd9f9290ede1664d5fa18b3fbd6c5f7401d3 (patch) | |
| tree | ba5a8fe8e2373744edc22974571a953840d6c9e8 /drivers/md | |
| parent | 544ae5f96e14998cabc637fa20cf409eb92a0dd0 (diff) | |
| parent | b706f64281b24d8b1fdc8ae883700131d365c412 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()
blocK: Restore barrier support for md and probably other virtual devices.
block: get rid of queue-private command filter
block: Create bip slabs with embedded integrity vectors
cfq-iosched: get rid of the need for __GFP_NOFAIL in cfq_find_alloc_queue()
cfq-iosched: move cfqq initialization out of cfq_find_alloc_queue()
Trivial typo fixes in Documentation/block/data-integrity.txt.
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 3c6d4ee8921..9acd54a5cff 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
| @@ -1017,7 +1017,7 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector, | |||
| 1017 | clone->bi_flags |= 1 << BIO_CLONED; | 1017 | clone->bi_flags |= 1 << BIO_CLONED; |
| 1018 | 1018 | ||
| 1019 | if (bio_integrity(bio)) { | 1019 | if (bio_integrity(bio)) { |
| 1020 | bio_integrity_clone(clone, bio, GFP_NOIO); | 1020 | bio_integrity_clone(clone, bio, GFP_NOIO, bs); |
| 1021 | bio_integrity_trim(clone, | 1021 | bio_integrity_trim(clone, |
| 1022 | bio_sector_offset(bio, idx, offset), len); | 1022 | bio_sector_offset(bio, idx, offset), len); |
| 1023 | } | 1023 | } |
| @@ -1045,7 +1045,7 @@ static struct bio *clone_bio(struct bio *bio, sector_t sector, | |||
| 1045 | clone->bi_flags &= ~(1 << BIO_SEG_VALID); | 1045 | clone->bi_flags &= ~(1 << BIO_SEG_VALID); |
| 1046 | 1046 | ||
| 1047 | if (bio_integrity(bio)) { | 1047 | if (bio_integrity(bio)) { |
| 1048 | bio_integrity_clone(clone, bio, GFP_NOIO); | 1048 | bio_integrity_clone(clone, bio, GFP_NOIO, bs); |
| 1049 | 1049 | ||
| 1050 | if (idx != bio->bi_idx || clone->bi_size < bio->bi_size) | 1050 | if (idx != bio->bi_idx || clone->bi_size < bio->bi_size) |
| 1051 | bio_integrity_trim(clone, | 1051 | bio_integrity_trim(clone, |