diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2018-11-12 17:19:32 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-12 17:19:32 -0700 |
| commit | d16a67667c611f00b5ec0017ad2b18f473af13d2 (patch) | |
| tree | 17499f39a767222e983f1d1b6be58dc1f0bd60f9 /drivers/ide/ide-io.c | |
| parent | loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl() (diff) | |
| download | linux-dev-d16a67667c611f00b5ec0017ad2b18f473af13d2.tar.xz linux-dev-d16a67667c611f00b5ec0017ad2b18f473af13d2.zip | |
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>
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 94e9c79c41cf..c0dd0fad16a3 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(); |