projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[deliverable/linux.git]
/
block
/
bio.c
diff --git
a/block/bio.c
b/block/bio.c
index 3f76a38a5e2d66f81fe78e4d3feffe825e3214eb..f39477538fef0a8759ce966b40e5034c0cb43bba 100644
(file)
--- a/
block/bio.c
+++ b/
block/bio.c
@@
-580,7
+580,7
@@
void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
*/
bio->bi_bdev = bio_src->bi_bdev;
bio_set_flag(bio, BIO_CLONED);
*/
bio->bi_bdev = bio_src->bi_bdev;
bio_set_flag(bio, BIO_CLONED);
- bio->bi_
rw = bio_src->bi_rw
;
+ bio->bi_
opf = bio_src->bi_opf
;
bio->bi_iter = bio_src->bi_iter;
bio->bi_io_vec = bio_src->bi_io_vec;
bio->bi_iter = bio_src->bi_iter;
bio->bi_io_vec = bio_src->bi_io_vec;
@@
-663,7
+663,7
@@
struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,
if (!bio)
return NULL;
bio->bi_bdev = bio_src->bi_bdev;
if (!bio)
return NULL;
bio->bi_bdev = bio_src->bi_bdev;
- bio->bi_
rw = bio_src->bi_rw
;
+ bio->bi_
opf = bio_src->bi_opf
;
bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector;
bio->bi_iter.bi_size = bio_src->bi_iter.bi_size;
bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector;
bio->bi_iter.bi_size = bio_src->bi_iter.bi_size;
@@
-873,7
+873,7
@@
int submit_bio_wait(struct bio *bio)
init_completion(&ret.event);
bio->bi_private = &ret;
bio->bi_end_io = submit_bio_wait_endio;
init_completion(&ret.event);
bio->bi_private = &ret;
bio->bi_end_io = submit_bio_wait_endio;
- bio->bi_
rw
|= REQ_SYNC;
+ bio->bi_
opf
|= REQ_SYNC;
submit_bio(bio);
wait_for_completion_io(&ret.event);
submit_bio(bio);
wait_for_completion_io(&ret.event);
This page took
0.024643 seconds
and
5
git commands to generate.