Skip to content

Commit 5cde8fb

Browse files
author
CKI KWF Bot
committed
Merge: loop: use kiocb helpers to fix lockdep warning
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1278 loop: use kiocb helpers to fix lockdep warning JIRA: https://issues.redhat.com/browse/RHEL-103981 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Maurizio Lombardi <mlombard@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents bd502f3 + e496bb2 commit 5cde8fb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/block/loop.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,13 @@ static void lo_complete_rq(struct request *rq)
308308
static void lo_rw_aio_do_completion(struct loop_cmd *cmd)
309309
{
310310
struct request *rq = blk_mq_rq_from_pdu(cmd);
311-
struct loop_device *lo = rq->q->queuedata;
312311

313312
if (!atomic_dec_and_test(&cmd->ref))
314313
return;
315314
kfree(cmd->bvec);
316315
cmd->bvec = NULL;
317316
if (req_op(rq) == REQ_OP_WRITE)
318-
file_end_write(lo->lo_backing_file);
317+
kiocb_end_write(&cmd->iocb);
319318
if (likely(!blk_should_fake_timeout(rq->q)))
320319
blk_mq_complete_request(rq);
321320
}
@@ -391,7 +390,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
391390
}
392391

393392
if (rw == ITER_SOURCE) {
394-
file_start_write(lo->lo_backing_file);
393+
kiocb_start_write(&cmd->iocb);
395394
ret = file->f_op->write_iter(&cmd->iocb, &iter);
396395
} else
397396
ret = file->f_op->read_iter(&cmd->iocb, &iter);

0 commit comments

Comments
 (0)