diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-18 01:17:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 01:17:32 -0400 |
| commit | 60747ef4d173c2747bf7f0377fb22846cb422195 (patch) | |
| tree | ea0faf33b952495c47909be1400c475a3f3821b0 /kernel/trace | |
| parent | 484334198f8ce9552e20930fff9408ebf6bcf94d (diff) | |
| parent | 184ca823481c99dadd7d946e5afd4bb921eab30d (diff) | |
| download | linux-60747ef4d173c2747bf7f0377fb22846cb422195.tar.gz linux-60747ef4d173c2747bf7f0377fb22846cb422195.tar.bz2 linux-60747ef4d173c2747bf7f0377fb22846cb422195.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes for both merge conflicts.
Resolution work done by Stephen Rothwell was used
as a reference.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/blktrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index fb345cd11883..7598e6ca817a 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -776,7 +776,7 @@ static void blk_add_trace_bio(struct request_queue *q, struct bio *bio, return; __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, - bio_op(bio), bio->bi_rw, what, error, 0, NULL); + bio_op(bio), bio->bi_opf, what, error, 0, NULL); } static void blk_add_trace_bio_bounce(void *ignore, @@ -881,7 +881,7 @@ static void blk_add_trace_split(void *ignore, __be64 rpdu = cpu_to_be64(pdu); __blk_add_trace(bt, bio->bi_iter.bi_sector, - bio->bi_iter.bi_size, bio_op(bio), bio->bi_rw, + bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf, BLK_TA_SPLIT, bio->bi_error, sizeof(rpdu), &rpdu); } @@ -915,7 +915,7 @@ static void blk_add_trace_bio_remap(void *ignore, r.sector_from = cpu_to_be64(from); __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, - bio_op(bio), bio->bi_rw, BLK_TA_REMAP, bio->bi_error, + bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_error, sizeof(r), &r); } |