Now all the users of ide_do_drive_cmd using ide_wait are converted to use blk_get_request instead of struct request on the stack. This puts WARN_ON to catch an overlooked user. We can remove WARN_ON and "if (rq->q)" part after a while. Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> --- drivers/ide/ide-io.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ce09f70..194e666 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -1669,7 +1669,9 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio if (rq->errors) err = rq->errors; - blk_put_request(rq); + WARN_ON(!rq->q); + if (rq->q) + blk_put_request(rq); } return err; -- 1.5.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
