Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342412
| From | mchristi@redhat.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 13/35] xfs: set bi_op to REQ_OP |
| Date | 2016-02-24 21:10 +0100 |
| Message-ID | <r5NV1-1ay-13@gated-at.bofh.it> (permalink) |
| References | <r5NBE-M1-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Mike Christie <mchristi@redhat.com>
This patch has xfs set the bio bi_op to a REQ_OP, and
rq_flag_bits to bi_rw.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_aops.c | 3 ++-
fs/xfs/xfs_buf.c | 27 +++++++++++++++------------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 9cd38d1..21867fc 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -393,7 +393,8 @@ xfs_submit_ioend_bio(
atomic_inc(&ioend->io_remaining);
bio->bi_private = ioend;
bio->bi_end_io = xfs_end_bio;
- bio->bi_rw = (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE);
+ bio->bi_op = REQ_OP_WRITE;
+ bio->bi_rw = WB_SYNC_ALL ? WRITE_SYNC : 0;
submit_bio(bio);
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 079bb77..917774e 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1131,7 +1131,8 @@ xfs_buf_ioapply_map(
int map,
int *buf_offset,
int *count,
- int rw)
+ int op,
+ int op_flags)
{
int page_index;
int total_nr_pages = bp->b_page_count;
@@ -1170,7 +1171,8 @@ next_chunk:
bio->bi_iter.bi_sector = sector;
bio->bi_end_io = xfs_buf_bio_end_io;
bio->bi_private = bp;
- bio->bi_rw = rw;
+ bio->bi_op = op;
+ bio->bi_rw = op_flags;
for (; size && nr_pages; nr_pages--, page_index++) {
int rbytes, nbytes = PAGE_SIZE - offset;
@@ -1214,7 +1216,8 @@ _xfs_buf_ioapply(
struct xfs_buf *bp)
{
struct blk_plug plug;
- int rw;
+ int op;
+ int op_flags = 0;
int offset;
int size;
int i;
@@ -1233,14 +1236,13 @@ _xfs_buf_ioapply(
bp->b_ioend_wq = bp->b_target->bt_mount->m_buf_workqueue;
if (bp->b_flags & XBF_WRITE) {
+ op = REQ_OP_WRITE;
if (bp->b_flags & XBF_SYNCIO)
- rw = WRITE_SYNC;
- else
- rw = WRITE;
+ op_flags = WRITE_SYNC;
if (bp->b_flags & XBF_FUA)
- rw |= REQ_FUA;
+ op_flags |= REQ_FUA;
if (bp->b_flags & XBF_FLUSH)
- rw |= REQ_FLUSH;
+ op_flags |= REQ_FLUSH;
/*
* Run the write verifier callback function if it exists. If
@@ -1270,13 +1272,14 @@ _xfs_buf_ioapply(
}
}
} else if (bp->b_flags & XBF_READ_AHEAD) {
- rw = READA;
+ op = REQ_OP_READ;
+ op_flags = REQ_RAHEAD;
} else {
- rw = READ;
+ op = REQ_OP_READ;
}
/* we only use the buffer cache for meta-data */
- rw |= REQ_META;
+ op_flags |= REQ_META;
/*
* Walk all the vectors issuing IO on them. Set up the initial offset
@@ -1288,7 +1291,7 @@ _xfs_buf_ioapply(
size = BBTOB(bp->b_io_length);
blk_start_plug(&plug);
for (i = 0; i < bp->b_map_count; i++) {
- xfs_buf_ioapply_map(bp, i, &offset, &size, rw);
+ xfs_buf_ioapply_map(bp, i, &offset, &size, op, op_flags);
if (bp->b_error)
break;
if (size <= 0)
--
1.8.3.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/35 v4] separate operations from flags in the bio/request structs mchristi@redhat.com - 2016-02-24 20:50 +0100
[PATCH 31/35] block, fs: remove old REQ definitions. mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 14/35] hfsplus: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 22/35] drbd: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 20/35] dm: pass dm stats data dir instead of bi_rw mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 26/35] block: set op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
Re: [PATCH 26/35] block: set op to REQ_OP kbuild test robot <lkp@intel.com> - 2016-02-24 23:20 +0100
[PATCH 32/35] block: shrink bi_rw and bi_op mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 19/35] dm: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 33/35] block, drivers: add REQ_OP_FLUSH operation mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 24/35] xen: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 30/35] block, fs, drivers: do not test bi_rw for REQ_OPs mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 23/35] md/raid: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 34/35] block: add QUEUE_FLAGs for flush and fua mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 28/35] blktrace: get op from req->op/bio->bi_op mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 29/35] ide cd: do not set REQ_WRITE on requests. mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 27/35] drivers: set request op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 21/35] bcache: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 16/35] nilfs: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:00 +0100
[PATCH 07/35] btrfs: have submit_one_bio users setup bio bi_op mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 10/35] btrfs: don't pass rq_flag_bits if there is a bio mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 03/35] block, fs, mm, drivers: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 15/35] mpage: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 06/35] direct-io: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 13/35] xfs: set bi_op to REQ_OP mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 09/35] btrfs: update __btrfs_map_block for bi_op transition mchristi@redhat.com - 2016-02-24 21:10 +0100
[PATCH 04/35] fs: have submit_bh users pass in op and flags separately mchristi@redhat.com - 2016-02-24 21:10 +0100
Re: [PATCH 00/35 v4] separate operations from flags in the bio/request structs Christoph Hellwig <hch@infradead.org> - 2016-02-29 18:20 +0100
Re: [PATCH 00/35 v4] separate operations from flags in the bio/request structs Mike Christie <michaelc@cs.wisc.edu> - 2016-02-29 18:40 +0100
csiph-web