mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
block: introduce blk_rq_is_passthrough
This can be used to check for fs vs non-fs requests and basically removes all knowledge of BLOCK_PC specific from the block layer, as well as preparing for removing the cmd_type field in struct request. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
09fc54ccc4
commit
57292b58dd
21 changed files with 59 additions and 53 deletions
|
|
@ -1937,7 +1937,7 @@ nvme_fc_complete_rq(struct request *rq)
|
|||
return;
|
||||
}
|
||||
|
||||
if (rq->cmd_type == REQ_TYPE_DRV_PRIV)
|
||||
if (blk_rq_is_passthrough(rq))
|
||||
error = rq->errors;
|
||||
else
|
||||
error = nvme_error_status(rq->errors);
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
|
|||
*/
|
||||
if (ns && ns->ms && !blk_integrity_rq(req)) {
|
||||
if (!(ns->pi_type && ns->ms == 8) &&
|
||||
req->cmd_type != REQ_TYPE_DRV_PRIV) {
|
||||
!blk_rq_is_passthrough(req)) {
|
||||
blk_mq_end_request(req, -EFAULT);
|
||||
return BLK_MQ_RQ_QUEUE_OK;
|
||||
}
|
||||
|
|
@ -645,7 +645,7 @@ static void nvme_complete_rq(struct request *req)
|
|||
return;
|
||||
}
|
||||
|
||||
if (req->cmd_type == REQ_TYPE_DRV_PRIV)
|
||||
if (blk_rq_is_passthrough(req))
|
||||
error = req->errors;
|
||||
else
|
||||
error = nvme_error_status(req->errors);
|
||||
|
|
|
|||
|
|
@ -1423,7 +1423,7 @@ static inline bool nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue,
|
|||
if (unlikely(!test_bit(NVME_RDMA_Q_LIVE, &queue->flags))) {
|
||||
struct nvme_command *cmd = nvme_req(rq)->cmd;
|
||||
|
||||
if (rq->cmd_type != REQ_TYPE_DRV_PRIV ||
|
||||
if (!blk_rq_is_passthrough(rq) ||
|
||||
cmd->common.opcode != nvme_fabrics_command ||
|
||||
cmd->fabrics.fctype != nvme_fabrics_type_connect)
|
||||
return false;
|
||||
|
|
@ -1522,7 +1522,7 @@ static void nvme_rdma_complete_rq(struct request *rq)
|
|||
return;
|
||||
}
|
||||
|
||||
if (rq->cmd_type == REQ_TYPE_DRV_PRIV)
|
||||
if (blk_rq_is_passthrough(rq))
|
||||
error = rq->errors;
|
||||
else
|
||||
error = nvme_error_status(rq->errors);
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ static void nvme_loop_complete_rq(struct request *req)
|
|||
return;
|
||||
}
|
||||
|
||||
if (req->cmd_type == REQ_TYPE_DRV_PRIV)
|
||||
if (blk_rq_is_passthrough(req))
|
||||
error = req->errors;
|
||||
else
|
||||
error = nvme_error_status(req->errors);
|
||||
|
|
|
|||
Loading…
Reference in a new issue