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

Commit 7a5abb4b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: factor out a add nvme_is_write helper 



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

Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJay Freyensee <james.p.freyensee@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a229dbf6

drivers/nvme/host/core.c

+2 −3
Original line number Diff line number Diff line
@@ -193,10 +193,9 @@ EXPORT_SYMBOL_GPL(nvme_requeue_req); 
struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags)

{

	bool write = cmd->common.opcode & 1;

	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))

		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,

		u32 *result, unsigned timeout)

{

	bool write = cmd->common.opcode & 1;

	bool write = nvme_is_write(cmd);

	struct nvme_completion cqe;

	struct nvme_ns *ns = q->queuedata;

	struct gendisk *disk = ns ? ns->disk : NULL;

include/linux/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -590,6 +590,11 @@ struct nvme_command { 
	};

};



static inline bool nvme_is_write(struct nvme_command *cmd)

{

	return cmd->common.opcode & 1;

}



enum {

	NVME_SC_SUCCESS			= 0x0,

	NVME_SC_INVALID_OPCODE		= 0x1,