Skip to content

Commit ece6f9e

Browse files
author
Herton R. Krzesinski
committed
Merge: [s390]: RHEL9 - dasd: fix no record found for raw_track_access
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1893 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2161269 Tested: by IBM Build-Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=50102305 Commits: 590ce6d s390/dasd: fix no record found for raw_track_access Signed-off-by: Tobias Huschle <thuschle@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents d6b84f7 + de7c61d commit ece6f9e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/s390/block/dasd_eckd.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4725,7 +4725,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
47254725
struct dasd_device *basedev;
47264726
struct req_iterator iter;
47274727
struct dasd_ccw_req *cqr;
4728-
unsigned int first_offs;
47294728
unsigned int trkcount;
47304729
unsigned long *idaws;
47314730
unsigned int size;
@@ -4759,7 +4758,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
47594758
last_trk = (blk_rq_pos(req) + blk_rq_sectors(req) - 1) /
47604759
DASD_RAW_SECTORS_PER_TRACK;
47614760
trkcount = last_trk - first_trk + 1;
4762-
first_offs = 0;
47634761

47644762
if (rq_data_dir(req) == READ)
47654763
cmd = DASD_ECKD_CCW_READ_TRACK;
@@ -4803,13 +4801,13 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
48034801

48044802
if (use_prefix) {
48054803
prefix_LRE(ccw++, data, first_trk, last_trk, cmd, basedev,
4806-
startdev, 1, first_offs + 1, trkcount, 0, 0);
4804+
startdev, 1, 0, trkcount, 0, 0);
48074805
} else {
48084806
define_extent(ccw++, data, first_trk, last_trk, cmd, basedev, 0);
48094807
ccw[-1].flags |= CCW_FLAG_CC;
48104808

48114809
data += sizeof(struct DE_eckd_data);
4812-
locate_record_ext(ccw++, data, first_trk, first_offs + 1,
4810+
locate_record_ext(ccw++, data, first_trk, 0,
48134811
trkcount, cmd, basedev, 0, 0);
48144812
}
48154813

0 commit comments

Comments
 (0)