Skip to content

Commit 1643a20

Browse files
committed
Merge: block: flip iter directions in blk_rq_integrity_map_user()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1195 block: flip iter directions in blk_rq_integrity_map_user() JIRA: https://issues.redhat.com/browse/RHEL-102497 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Ewan D. Milne <emilne@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 54c7173 + 9a00e50 commit 1643a20

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

block/blk-integrity.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,
117117
{
118118
int ret;
119119
struct iov_iter iter;
120-
unsigned int direction;
121120

122-
if (op_is_write(req_op(rq)))
123-
direction = ITER_DEST;
124-
else
125-
direction = ITER_SOURCE;
126-
iov_iter_ubuf(&iter, direction, ubuf, bytes);
121+
iov_iter_ubuf(&iter, rq_data_dir(rq), ubuf, bytes);
127122
ret = bio_integrity_map_user(rq->bio, &iter);
128123
if (ret)
129124
return ret;

0 commit comments

Comments
 (0)