projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block, fs, mm, drivers: use bio set/get op accessors
[cascardo/linux.git]
/
fs
/
nfs
/
blocklayout
/
blocklayout.c
diff --git
a/fs/nfs/blocklayout/blocklayout.c
b/fs/nfs/blocklayout/blocklayout.c
index
4c79f4d
..
f55a4e7
100644
(file)
--- a/
fs/nfs/blocklayout/blocklayout.c
+++ b/
fs/nfs/blocklayout/blocklayout.c
@@
-107,7
+107,7
@@
bl_submit_bio(struct bio *bio)
if (bio) {
get_parallel(bio->bi_private);
dprintk("%s submitting %s bio %u@%llu\n", __func__,
if (bio) {
get_parallel(bio->bi_private);
dprintk("%s submitting %s bio %u@%llu\n", __func__,
- bio
->bi_rw
== READ ? "read" : "write",
+ bio
_op(bio)
== READ ? "read" : "write",
bio->bi_iter.bi_size,
(unsigned long long)bio->bi_iter.bi_sector);
submit_bio(bio);
bio->bi_iter.bi_size,
(unsigned long long)bio->bi_iter.bi_sector);
submit_bio(bio);
@@
-175,7
+175,7
@@
retry:
disk_addr >> SECTOR_SHIFT, end_io, par);
if (!bio)
return ERR_PTR(-ENOMEM);
disk_addr >> SECTOR_SHIFT, end_io, par);
if (!bio)
return ERR_PTR(-ENOMEM);
- bio
->bi_rw = rw
;
+ bio
_set_op_attrs(bio, rw, 0)
;
}
if (bio_add_page(bio, page, *len, offset) < *len) {
bio = bl_submit_bio(bio);
}
if (bio_add_page(bio, page, *len, offset) < *len) {
bio = bl_submit_bio(bio);