Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342405
| From | mchristi@redhat.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 16/35] nilfs: set bi_op to REQ_OP |
| Date | 2016-02-24 21:00 +0100 |
| Message-ID | <r5NLm-PN-59@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 nilfs 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/nilfs2/segbuf.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c
index 7666f1d..7b13e14 100644
--- a/fs/nilfs2/segbuf.c
+++ b/fs/nilfs2/segbuf.c
@@ -350,7 +350,8 @@ static void nilfs_end_bio_write(struct bio *bio)
}
static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf,
- struct nilfs_write_info *wi, int mode)
+ struct nilfs_write_info *wi, int mode,
+ int mode_flags)
{
struct bio *bio = wi->bio;
int err;
@@ -368,7 +369,8 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf,
bio->bi_end_io = nilfs_end_bio_write;
bio->bi_private = segbuf;
- bio->bi_rw = mode;
+ bio->bi_op = mode;
+ bio->bi_rw = mode_flags;
submit_bio(bio);
segbuf->sb_nbio++;
@@ -442,7 +444,7 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf,
return 0;
}
/* bio is FULL */
- err = nilfs_segbuf_submit_bio(segbuf, wi, mode);
+ err = nilfs_segbuf_submit_bio(segbuf, wi, mode, 0);
/* never submit current bh */
if (likely(!err))
goto repeat;
@@ -466,19 +468,19 @@ static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
{
struct nilfs_write_info wi;
struct buffer_head *bh;
- int res = 0, rw = WRITE;
+ int res = 0;
wi.nilfs = nilfs;
nilfs_segbuf_prepare_write(segbuf, &wi);
list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) {
- res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, rw);
+ res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, REQ_OP_WRITE);
if (unlikely(res))
goto failed_bio;
}
list_for_each_entry(bh, &segbuf->sb_payload_buffers, b_assoc_buffers) {
- res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, rw);
+ res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, REQ_OP_WRITE);
if (unlikely(res))
goto failed_bio;
}
@@ -488,8 +490,8 @@ static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
* Last BIO is always sent through the following
* submission.
*/
- rw |= REQ_SYNC;
- res = nilfs_segbuf_submit_bio(segbuf, &wi, rw);
+ res = nilfs_segbuf_submit_bio(segbuf, &wi, REQ_OP_WRITE,
+ REQ_SYNC);
}
failed_bio:
--
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