Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 039c635f authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

ide, scsi: Tell the block layer at request allocation time about preempt requests 



Convert blk_get_request(q, op, __GFP_RECLAIM) into
blk_get_request_flags(q, op, BLK_MQ_PREEMPT). This patch does not
change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Tested-by: default avatarMartin Steigerwald <martin@lichtvoll.de>
Acked-by: David S. Miller <davem@davemloft.net> [ for IDE ]
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1b6d65a0

drivers/ide/ide-pm.c

+2 −2
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ int generic_ide_resume(struct device *dev) 
	}



	memset(&rqpm, 0, sizeof(rqpm));

	rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM);

	rq = blk_get_request_flags(drive->queue, REQ_OP_DRV_IN,

				   BLK_MQ_REQ_PREEMPT);

	ide_req(rq)->type = ATA_PRIV_PM_RESUME;

	rq->rq_flags |= RQF_PREEMPT;

	rq->special = &rqpm;

	rqpm.pm_step = IDE_PM_START_RESUME;

	rqpm.pm_state = PM_EVENT_ON;

drivers/scsi/scsi_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -252,9 +252,9 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
	struct scsi_request *rq;

	int ret = DRIVER_ERROR << 24;



	req = blk_get_request(sdev->request_queue,

	req = blk_get_request_flags(sdev->request_queue,

			data_direction == DMA_TO_DEVICE ?

			REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, __GFP_RECLAIM);

			REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, BLK_MQ_REQ_PREEMPT);

	if (IS_ERR(req))

		return ret;

	rq = scsi_req(req);
@@ -268,7 +268,7 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
	rq->retries = retries;

	req->timeout = timeout;

	req->cmd_flags |= flags;

	req->rq_flags |= rq_flags | RQF_QUIET | RQF_PREEMPT;

	req->rq_flags |= rq_flags | RQF_QUIET;



	/*

	 * head injection *required* here otherwise quiesce won't work