From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 13 Nov 2018 00:19:32 +0000 (-0700)
Subject: ide: don't clear special on ide_queue_rq() entry
X-Git-Tag: v5.15~7255^2~250
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d16a67667c611f00b5ec0017ad2b18f473af13d2;p=platform%2Fkernel%2Flinux-starfive.git

ide: don't clear special on ide_queue_rq() entry

We can't use RQF_DONTPREP to see if we should clear ->special,
as someone could have set that while inserting the request. Make
sure we clear it in our ->initialize_rq_fn() helper instead.

Fixes: 22ce0a7ccf23 ("ide: don't use req->special")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 94e9c79..c0dd0fa 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -463,11 +463,6 @@ blk_status_t ide_queue_rq(struct blk_mq_hw_ctx *hctx,
 	struct request	*rq = bd->rq;
 	ide_startstop_t	startstop;
 
-	if (!(rq->rq_flags & RQF_DONTPREP)) {
-		rq->rq_flags |= RQF_DONTPREP;
-		ide_req(rq)->special = NULL;
-	}
-
 	/* HLD do_request() callback might sleep, make sure it's okay */
 	might_sleep();
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4038483..63627be 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -746,6 +746,7 @@ static void ide_initialize_rq(struct request *rq)
 {
 	struct ide_request *req = blk_mq_rq_to_pdu(rq);
 
+	req->special = NULL;
 	scsi_req_init(&req->sreq);
 	req->sreq.sense = req->sense;
 }