diff options
| author | Jens Axboe | 2016-08-05 23:35:16 +0200 |
|---|---|---|
| committer | Jens Axboe | 2016-08-07 22:41:02 +0200 |
| commit | 1eff9d322a444245c67515edb52bc0eb68374aa8 (patch) | |
| tree | aed4c3bfdf94202b93b9b5ce74c6e247f4c3ab85 /drivers/block/drbd/drbd_worker.c | |
| parent | target: iblock_execute_sync_cache() should use bio_set_op_attrs() (diff) | |
| download | kernel-qcow2-linux-1eff9d322a444245c67515edb52bc0eb68374aa8.tar.gz kernel-qcow2-linux-1eff9d322a444245c67515edb52bc0eb68374aa8.tar.xz kernel-qcow2-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 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 35dbb3dca47e..c6755c9a0aea 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -256,7 +256,7 @@ void drbd_request_endio(struct bio *bio) what = DISCARD_COMPLETED_WITH_ERROR; break; case REQ_OP_READ: - if (bio->bi_rw & REQ_RAHEAD) + if (bio->bi_opf & REQ_RAHEAD) what = READ_AHEAD_COMPLETED_WITH_ERROR; else what = READ_COMPLETED_WITH_ERROR; |