diff options
| author | Jens Axboe <axboe@fb.com> | 2016-08-05 15:35:16 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-08-07 14:41:02 -0600 |
| commit | 1eff9d322a444245c67515edb52bc0eb68374aa8 (patch) | |
| tree | aed4c3bfdf94202b93b9b5ce74c6e247f4c3ab85 /include/linux/blk-cgroup.h | |
| parent | 31c64f78767948986c6c4c6f488803722c6b0e7a (diff) | |
| download | linux-1eff9d322a444245c67515edb52bc0eb68374aa8.tar.gz linux-1eff9d322a444245c67515edb52bc0eb68374aa8.tar.bz2 linux-1eff9d322a444245c67515edb52bc0eb68374aa8.zip | |
block: rename bio bi_rw to bi_opf
Since commit 63a4cc24867d, 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>
Diffstat (limited to 'include/linux/blk-cgroup.h')
| -rw-r--r-- | include/linux/blk-cgroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index f77150a4a96a..10648e300c93 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -714,9 +714,9 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q, if (!throtl) { blkg = blkg ?: q->root_blkg; - blkg_rwstat_add(&blkg->stat_bytes, bio_op(bio), bio->bi_rw, + blkg_rwstat_add(&blkg->stat_bytes, bio_op(bio), bio->bi_opf, bio->bi_iter.bi_size); - blkg_rwstat_add(&blkg->stat_ios, bio_op(bio), bio->bi_rw, 1); + blkg_rwstat_add(&blkg->stat_ios, bio_op(bio), bio->bi_opf, 1); } rcu_read_unlock(); |