diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 14:19:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 14:19:05 -0500 |
commit | f568849edac8611d603e00bd6cbbcfea09395ae6 (patch) | |
tree | b9472d640fe5d87426d38c9d81d946cf197ad3fb /kernel | |
parent | d9894c228b11273e720bb63ba120d1d326fe9d94 (diff) | |
parent | 675675ada486dde5bf9aa51665e90706bff11a35 (diff) |
Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block
Pull core block IO changes from Jens Axboe:
"The major piece in here is the immutable bio_ve series from Kent, the
rest is fairly minor. It was supposed to go in last round, but
various issues pushed it to this release instead. The pull request
contains:
- Various smaller blk-mq fixes from different folks. Nothing major
here, just minor fixes and cleanups.
- Fix for a memory leak in the error path in the block ioctl code
from Christian Engelmayer.
- Header export fix from CaiZhiyong.
- Finally the immutable biovec changes from Kent Overstreet. This
enables some nice future work on making arbitrarily sized bios
possible, and splitting more efficient. Related fixes to immutable
bio_vecs:
- dm-cache immutable fixup from Mike Snitzer.
- btrfs immutable fixup from Muthu Kumar.
- bio-integrity fix from Nic Bellinger, which is also going to stable"
* 'for-3.14/core' of git://git.kernel.dk/linux-block: (44 commits)
xtensa: fixup simdisk driver to work with immutable bio_vecs
block/blk-mq-cpu.c: use hotcpu_notifier()
blk-mq: for_each_* macro correctness
block: Fix memory leak in rw_copy_check_uvector() handling
bio-integrity: Fix bio_integrity_verify segment start bug
block: remove unrelated header files and export symbol
blk-mq: uses page->list incorrectly
blk-mq: use __smp_call_function_single directly
btrfs: fix missing increment of bi_remaining
Revert "block: Warn and free bio if bi_end_io is not set"
block: Warn and free bio if bi_end_io is not set
blk-mq: fix initializing request's start time
block: blk-mq: don't export blk_mq_free_queue()
block: blk-mq: make blk_sync_queue support mq
block: blk-mq: support draining mq queue
dm cache: increment bi_remaining when bi_end_io is restored
block: fixup for generic bio chaining
block: Really silence spurious compiler warnings
block: Silence spurious compiler warnings
block: Kill bio_pair_split()
...
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/block_io.c | 2 | ||||
-rw-r--r-- | kernel/trace/blktrace.c | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c index d09dd10c5a5e..9a58bc258810 100644 --- a/kernel/power/block_io.c +++ b/kernel/power/block_io.c | |||
@@ -32,7 +32,7 @@ static int submit(int rw, struct block_device *bdev, sector_t sector, | |||
32 | struct bio *bio; | 32 | struct bio *bio; |
33 | 33 | ||
34 | bio = bio_alloc(__GFP_WAIT | __GFP_HIGH, 1); | 34 | bio = bio_alloc(__GFP_WAIT | __GFP_HIGH, 1); |
35 | bio->bi_sector = sector; | 35 | bio->bi_iter.bi_sector = sector; |
36 | bio->bi_bdev = bdev; | 36 | bio->bi_bdev = bdev; |
37 | bio->bi_end_io = end_swap_bio_read; | 37 | bio->bi_end_io = end_swap_bio_read; |
38 | 38 | ||
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index f785aef65799..b418cb0d7242 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -781,8 +781,8 @@ static void blk_add_trace_bio(struct request_queue *q, struct bio *bio, | |||
781 | if (!error && !bio_flagged(bio, BIO_UPTODATE)) | 781 | if (!error && !bio_flagged(bio, BIO_UPTODATE)) |
782 | error = EIO; | 782 | error = EIO; |
783 | 783 | ||
784 | __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what, | 784 | __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, |
785 | error, 0, NULL); | 785 | bio->bi_rw, what, error, 0, NULL); |
786 | } | 786 | } |
787 | 787 | ||
788 | static void blk_add_trace_bio_bounce(void *ignore, | 788 | static void blk_add_trace_bio_bounce(void *ignore, |
@@ -885,8 +885,9 @@ static void blk_add_trace_split(void *ignore, | |||
885 | if (bt) { | 885 | if (bt) { |
886 | __be64 rpdu = cpu_to_be64(pdu); | 886 | __be64 rpdu = cpu_to_be64(pdu); |
887 | 887 | ||
888 | __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, | 888 | __blk_add_trace(bt, bio->bi_iter.bi_sector, |
889 | BLK_TA_SPLIT, !bio_flagged(bio, BIO_UPTODATE), | 889 | bio->bi_iter.bi_size, bio->bi_rw, BLK_TA_SPLIT, |
890 | !bio_flagged(bio, BIO_UPTODATE), | ||
890 | sizeof(rpdu), &rpdu); | 891 | sizeof(rpdu), &rpdu); |
891 | } | 892 | } |
892 | } | 893 | } |
@@ -918,9 +919,9 @@ static void blk_add_trace_bio_remap(void *ignore, | |||
918 | r.device_to = cpu_to_be32(bio->bi_bdev->bd_dev); | 919 | r.device_to = cpu_to_be32(bio->bi_bdev->bd_dev); |
919 | r.sector_from = cpu_to_be64(from); | 920 | r.sector_from = cpu_to_be64(from); |
920 | 921 | ||
921 | __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, | 922 | __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, |
922 | BLK_TA_REMAP, !bio_flagged(bio, BIO_UPTODATE), | 923 | bio->bi_rw, BLK_TA_REMAP, |
923 | sizeof(r), &r); | 924 | !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r); |
924 | } | 925 | } |
925 | 926 | ||
926 | /** | 927 | /** |