nvme: factor out a add nvme_is_write helper

Centralize the check if a given NVMe command reads or writes data.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Jay Freyensee <james.p.freyensee@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2016-06-06 23:20:49 +02:00 committed by Jens Axboe
parent a229dbf61e
commit 7a5abb4b48
2 changed files with 7 additions and 3 deletions

View File

@ -193,10 +193,9 @@ EXPORT_SYMBOL_GPL(nvme_requeue_req);
struct request *nvme_alloc_request(struct request_queue *q, struct request *nvme_alloc_request(struct request_queue *q,
struct nvme_command *cmd, unsigned int flags) struct nvme_command *cmd, unsigned int flags)
{ {
bool write = cmd->common.opcode & 1;
struct request *req; struct request *req;
req = blk_mq_alloc_request(q, write, flags); req = blk_mq_alloc_request(q, nvme_is_write(cmd), flags);
if (IS_ERR(req)) if (IS_ERR(req))
return req; return req;
@ -361,7 +360,7 @@ int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
void __user *meta_buffer, unsigned meta_len, u32 meta_seed, void __user *meta_buffer, unsigned meta_len, u32 meta_seed,
u32 *result, unsigned timeout) u32 *result, unsigned timeout)
{ {
bool write = cmd->common.opcode & 1; bool write = nvme_is_write(cmd);
struct nvme_completion cqe; struct nvme_completion cqe;
struct nvme_ns *ns = q->queuedata; struct nvme_ns *ns = q->queuedata;
struct gendisk *disk = ns ? ns->disk : NULL; struct gendisk *disk = ns ? ns->disk : NULL;

View File

@ -590,6 +590,11 @@ struct nvme_command {
}; };
}; };
static inline bool nvme_is_write(struct nvme_command *cmd)
{
return cmd->common.opcode & 1;
}
enum { enum {
NVME_SC_SUCCESS = 0x0, NVME_SC_SUCCESS = 0x0,
NVME_SC_INVALID_OPCODE = 0x1, NVME_SC_INVALID_OPCODE = 0x1,