Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1306672
| From | mchristi@redhat.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 17/35] ocfs2: set bi_op to REQ_OP |
| Date | 2016-01-11 21:40 +0100 |
| Message-ID | <qPRpV-7qL-21@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 ocfs2 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>
---
fs/ocfs2/cluster/heartbeat.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 119bd85..271ef2a 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -391,7 +391,8 @@ static void o2hb_bio_end_io(struct bio *bio)
static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
struct o2hb_bio_wait_ctxt *wc,
unsigned int *current_slot,
- unsigned int max_slots, int rw)
+ unsigned int max_slots, int op,
+ int op_flags)
{
int len, current_page;
unsigned int vec_len, vec_start;
@@ -417,7 +418,8 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
bio->bi_bdev = reg->hr_bdev;
bio->bi_private = wc;
bio->bi_end_io = o2hb_bio_end_io;
- bio->bi_rw = rw;
+ bio->bi_op = op;
+ bio->bi_rw = op_flags;
vec_start = (cs << bits) % PAGE_CACHE_SIZE;
while(cs < max_slots) {
@@ -454,7 +456,7 @@ static int o2hb_read_slots(struct o2hb_region *reg,
while(current_slot < max_slots) {
bio = o2hb_setup_one_bio(reg, &wc, ¤t_slot, max_slots,
- READ);
+ REQ_OP_READ, 0);
if (IS_ERR(bio)) {
status = PTR_ERR(bio);
mlog_errno(status);
@@ -486,7 +488,8 @@ static int o2hb_issue_node_write(struct o2hb_region *reg,
slot = o2nm_this_node();
- bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, WRITE_SYNC);
+ bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, REQ_OP_WRITE,
+ WRITE_SYNC);
if (IS_ERR(bio)) {
status = PTR_ERR(bio);
mlog_errno(status);
--
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