projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
s390
/
block
/
dasd_eckd.c
diff --git
a/drivers/s390/block/dasd_eckd.c
b/drivers/s390/block/dasd_eckd.c
index
fb5d815
..
460e0f1
100644
(file)
--- a/
drivers/s390/block/dasd_eckd.c
+++ b/
drivers/s390/block/dasd_eckd.c
@@
-3276,7
+3276,7
@@
static int dasd_eckd_ese_read(struct dasd_ccw_req *cqr, struct irb *irb)
end_blk = (curr_trk + 1) * recs_per_trk;
rq_for_each_segment(bv, req, iter) {
end_blk = (curr_trk + 1) * recs_per_trk;
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
for (off = 0; off < bv.bv_len; off += blksize) {
if (first_blk + blk_count >= end_blk) {
cqr->proc_bytes = blk_count * blksize;
for (off = 0; off < bv.bv_len; off += blksize) {
if (first_blk + blk_count >= end_blk) {
cqr->proc_bytes = blk_count * blksize;
@@
-4008,7
+4008,7
@@
static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
last_rec - recid + 1, cmd, basedev, blksize);
}
rq_for_each_segment(bv, req, iter) {
last_rec - recid + 1, cmd, basedev, blksize);
}
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
if (dasd_page_cache) {
char *copy = kmem_cache_alloc(dasd_page_cache,
GFP_DMA | __GFP_NOWARN);
if (dasd_page_cache) {
char *copy = kmem_cache_alloc(dasd_page_cache,
GFP_DMA | __GFP_NOWARN);
@@
-4175,7
+4175,7
@@
static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
idaw_dst = NULL;
idaw_len = 0;
rq_for_each_segment(bv, req, iter) {
idaw_dst = NULL;
idaw_len = 0;
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
seg_len = bv.bv_len;
while (seg_len) {
if (new_track) {
seg_len = bv.bv_len;
while (seg_len) {
if (new_track) {
@@
-4518,7
+4518,7
@@
static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
new_track = 1;
recid = first_rec;
rq_for_each_segment(bv, req, iter) {
new_track = 1;
recid = first_rec;
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
seg_len = bv.bv_len;
while (seg_len) {
if (new_track) {
seg_len = bv.bv_len;
while (seg_len) {
if (new_track) {
@@
-4551,7
+4551,7
@@
static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
}
} else {
rq_for_each_segment(bv, req, iter) {
}
} else {
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
last_tidaw = itcw_add_tidaw(itcw, 0x00,
dst, bv.bv_len);
if (IS_ERR(last_tidaw)) {
last_tidaw = itcw_add_tidaw(itcw, 0x00,
dst, bv.bv_len);
if (IS_ERR(last_tidaw)) {
@@
-4787,7
+4787,7
@@
static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
idaws = idal_create_words(idaws, rawpadpage, PAGE_SIZE);
}
rq_for_each_segment(bv, req, iter) {
idaws = idal_create_words(idaws, rawpadpage, PAGE_SIZE);
}
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
seg_len = bv.bv_len;
if (cmd == DASD_ECKD_CCW_READ_TRACK)
memset(dst, 0, seg_len);
seg_len = bv.bv_len;
if (cmd == DASD_ECKD_CCW_READ_TRACK)
memset(dst, 0, seg_len);
@@
-4848,7
+4848,7
@@
dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req)
if (private->uses_cdl == 0 || recid > 2*blk_per_trk)
ccw++;
rq_for_each_segment(bv, req, iter) {
if (private->uses_cdl == 0 || recid > 2*blk_per_trk)
ccw++;
rq_for_each_segment(bv, req, iter) {
- dst =
page_address(bv.bv_page) + bv.bv_offset
;
+ dst =
bvec_virt(&bv)
;
for (off = 0; off < bv.bv_len; off += blksize) {
/* Skip locate record. */
if (private->uses_cdl && recid <= 2*blk_per_trk)
for (off = 0; off < bv.bv_len; off += blksize) {
/* Skip locate record. */
if (private->uses_cdl && recid <= 2*blk_per_trk)