block: rename bio bi_rw to bi_opf
Since commit 63a4cc2486
, bio->bi_rw contains flags in the lower
portion and the op code in the higher portions. This means that
old code that relies on manually setting bi_rw is most likely
going to be broken. Instead of letting that brokeness linger,
rename the member, to force old and out-of-tree code to break
at compile time instead of at runtime.
No intended functional changes in this commit.
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
@@ -274,7 +274,7 @@ TRACE_EVENT(block_bio_bounce,
|
||||
bio->bi_bdev->bd_dev : 0;
|
||||
__entry->sector = bio->bi_iter.bi_sector;
|
||||
__entry->nr_sector = bio_sectors(bio);
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
|
||||
),
|
||||
@@ -313,7 +313,7 @@ TRACE_EVENT(block_bio_complete,
|
||||
__entry->sector = bio->bi_iter.bi_sector;
|
||||
__entry->nr_sector = bio_sectors(bio);
|
||||
__entry->error = error;
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
),
|
||||
|
||||
@@ -341,7 +341,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
|
||||
__entry->dev = bio->bi_bdev->bd_dev;
|
||||
__entry->sector = bio->bi_iter.bi_sector;
|
||||
__entry->nr_sector = bio_sectors(bio);
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
|
||||
),
|
||||
@@ -409,7 +409,7 @@ TRACE_EVENT(block_bio_queue,
|
||||
__entry->dev = bio->bi_bdev->bd_dev;
|
||||
__entry->sector = bio->bi_iter.bi_sector;
|
||||
__entry->nr_sector = bio_sectors(bio);
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
|
||||
),
|
||||
@@ -439,7 +439,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
|
||||
__entry->sector = bio ? bio->bi_iter.bi_sector : 0;
|
||||
__entry->nr_sector = bio ? bio_sectors(bio) : 0;
|
||||
blk_fill_rwbs(__entry->rwbs, bio ? bio_op(bio) : 0,
|
||||
bio ? bio->bi_rw : 0, __entry->nr_sector);
|
||||
bio ? bio->bi_opf : 0, __entry->nr_sector);
|
||||
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
|
||||
),
|
||||
|
||||
@@ -573,7 +573,7 @@ TRACE_EVENT(block_split,
|
||||
__entry->dev = bio->bi_bdev->bd_dev;
|
||||
__entry->sector = bio->bi_iter.bi_sector;
|
||||
__entry->new_sector = new_sector;
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
|
||||
),
|
||||
@@ -617,7 +617,7 @@ TRACE_EVENT(block_bio_remap,
|
||||
__entry->nr_sector = bio_sectors(bio);
|
||||
__entry->old_dev = dev;
|
||||
__entry->old_sector = from;
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
|
||||
blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
|
||||
bio->bi_iter.bi_size);
|
||||
),
|
||||
|
||||
|
Reference in New Issue
Block a user