Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1306670
| From | mchristi@redhat.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 24/35] xen: set bi_op to REQ_OP |
| Date | 2016-01-11 21:40 +0100 |
| Message-ID | <qPRpV-7qL-9@gated-at.bofh.it> (permalink) |
| References | <qPRgd-7mV-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Mike Christie <mchristi@redhat.com>
This patch has xen set the bio bi_op to a REQ_OP, and rq_flag_bits
to bi_rw.
This patch is compile tested only.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/block/xen-blkback/blkback.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 733d397..f977d29 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -488,7 +488,7 @@ static int xen_vbd_translate(struct phys_req *req, struct xen_blkif *blkif,
struct xen_vbd *vbd = &blkif->vbd;
int rc = -EACCES;
- if ((operation != READ) && vbd->readonly)
+ if ((operation != REQ_OP_READ) && vbd->readonly)
goto out;
if (likely(req->nr_sects)) {
@@ -995,7 +995,7 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
preq.sector_number = req->u.discard.sector_number;
preq.nr_sects = req->u.discard.nr_sectors;
- err = xen_vbd_translate(&preq, blkif, WRITE);
+ err = xen_vbd_translate(&preq, blkif, REQ_OP_WRITE);
if (err) {
pr_warn("access denied: DISCARD [%llu->%llu] on dev=%04x\n",
preq.sector_number,
@@ -1208,6 +1208,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
struct bio **biolist = pending_req->biolist;
int i, nbio = 0;
int operation;
+ int operation_flags = 0;
struct blk_plug plug;
bool drain = false;
struct grant_page **pages = pending_req->segments;
@@ -1226,17 +1227,19 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
switch (req_operation) {
case BLKIF_OP_READ:
blkif->st_rd_req++;
- operation = READ;
+ operation = REQ_OP_READ;
break;
case BLKIF_OP_WRITE:
blkif->st_wr_req++;
- operation = WRITE_ODIRECT;
+ operation = REQ_OP_WRITE;
+ operation_flags = WRITE_ODIRECT;
break;
case BLKIF_OP_WRITE_BARRIER:
drain = true;
case BLKIF_OP_FLUSH_DISKCACHE:
blkif->st_f_req++;
- operation = WRITE_FLUSH;
+ operation = REQ_OP_WRITE;
+ operation_flags = WRITE_FLUSH;
break;
default:
operation = 0; /* make gcc happy */
@@ -1248,7 +1251,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
nseg = req->operation == BLKIF_OP_INDIRECT ?
req->u.indirect.nr_segments : req->u.rw.nr_segments;
- if (unlikely(nseg == 0 && operation != WRITE_FLUSH) ||
+ if (unlikely(nseg == 0 && operation_flags != WRITE_FLUSH) ||
unlikely((req->operation != BLKIF_OP_INDIRECT) &&
(nseg > BLKIF_MAX_SEGMENTS_PER_REQUEST)) ||
unlikely((req->operation == BLKIF_OP_INDIRECT) &&
@@ -1289,7 +1292,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
if (xen_vbd_translate(&preq, blkif, operation) != 0) {
pr_debug("access denied: %s of [%llu,%llu] on dev=%04x\n",
- operation == READ ? "read" : "write",
+ operation == REQ_OP_READ ? "read" : "write",
preq.sector_number,
preq.sector_number + preq.nr_sects,
blkif->vbd.pdevice);
@@ -1348,7 +1351,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
bio->bi_private = pending_req;
bio->bi_end_io = end_block_io_op;
bio->bi_iter.bi_sector = preq.sector_number;
- bio->bi_rw = operation;
+ bio->bi_op = operation;
+ bio->bi_rw = operation_flags;
}
preq.sector_number += seg[i].nsec;
@@ -1356,7 +1360,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
/* This will be hit if the operation was a flush or discard. */
if (!bio) {
- BUG_ON(operation != WRITE_FLUSH);
+ BUG_ON(operation_flags != WRITE_FLUSH);
bio = bio_alloc(GFP_KERNEL, 0);
if (unlikely(bio == NULL))
@@ -1366,7 +1370,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
bio->bi_bdev = preq.bdev;
bio->bi_private = pending_req;
bio->bi_end_io = end_block_io_op;
- bio->bi_rw = operation;
+ bio->bi_op = operation;
+ bio->bi_rw = operation_flags;
}
atomic_set(&pending_req->pendcnt, nbio);
@@ -1378,9 +1383,9 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
/* Let the I/Os go.. */
blk_finish_plug(&plug);
- if (operation == READ)
+ if (operation == REQ_OP_READ)
blkif->st_rd_sect += preq.nr_sects;
- else if (operation & WRITE)
+ else if (operation == REQ_OP_WRITE)
blkif->st_wr_sect += preq.nr_sects;
return 0;
--
1.8.3.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/35 v3] eparate operations from flags in the bio/request structs mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 32/35] block: shrink bi_rw and bi_op mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 19/35] dm: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 30/35] block, fs, drivers: do not test bi_rw for REQ_OPs mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 35/35] block, drivers, fs: rename REQ_FLUSH to REQ_PREFLUSH mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 27/35] drivers: set request op to REQ_OP mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 08/35] btrfs: set bi_op tp REQ_OP mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 33/35] block, drivers: add REQ_OP_FLUSH operation mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 34/35] block: add QUEUE_FLAGs for flush and fua mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 31/35] block, fs: remove old REQ definitions. mchristi@redhat.com - 2016-01-11 21:30 +0100 [PATCH 18/35] pm: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 13/35] xfs: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 24/35] xen: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 20/35] dm: pass dm stats data dir instead of bi_rw mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 17/35] ocfs2: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 11/35] f2fs: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 12/35] gfs2: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 26/35] block: set op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 15/35] mpage: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 23/35] md/raid: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 21/35] bcache: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 07/35] btrfs: have submit_one_bio users setup bio bi_op mchristi@redhat.com - 2016-01-11 21:40 +0100 [PATCH 09/35] btrfs: update __btrfs_map_block for bi_op transition mchristi@redhat.com - 2016-01-11 21:50 +0100 [PATCH 04/35] fs: have submit_bh users pass in op and flags separately mchristi@redhat.com - 2016-01-11 21:50 +0100 [PATCH 02/35] block: add REQ_OP definitions and bi_op/op fields mchristi@redhat.com - 2016-01-11 21:50 +0100 [PATCH 06/35] direct-io: set bi_op to REQ_OP mchristi@redhat.com - 2016-01-11 21:50 +0100 [PATCH 05/35] fs: have ll_rw_block users pass in op and flags separately mchristi@redhat.com - 2016-01-11 21:50 +0100 [PATCH 10/35] btrfs: don't pass rq_flag_bits if there is a bio mchristi@redhat.com - 2016-01-11 21:50 +0100
csiph-web