Commit 1c32a801 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: improve the NVME_CONNECT_AUTHREQ* definitions 



Mark them as unsigned so that we don't need extra casts, and define
them relative to cdword0 instead of requiring extra shifts.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 1befd944

drivers/nvme/target/fabrics-cmd.c

+2 −4
Original line number Diff line number Diff line
@@ -272,8 +272,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) 
	req->cqe->result.u16 = cpu_to_le16(ctrl->cntlid);



	if (nvmet_has_auth(ctrl))

		req->cqe->result.u32 |=

			cpu_to_le32((u32)NVME_CONNECT_AUTHREQ_ATR << 16);

		req->cqe->result.u32 |= cpu_to_le32(NVME_CONNECT_AUTHREQ_ATR);

out:

	kfree(d);

complete:
@@ -334,8 +333,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) 


	pr_debug("adding queue %d to ctrl %d.\n", qid, ctrl->cntlid);

	if (nvmet_has_auth(ctrl))

		req->cqe->result.u32 |=

			cpu_to_le32((u32)NVME_CONNECT_AUTHREQ_ATR << 16);

		req->cqe->result.u32 |= cpu_to_le32(NVME_CONNECT_AUTHREQ_ATR);



out:

	kfree(d);

include/linux/nvme.h

+2 −2
Original line number Diff line number Diff line
@@ -1482,8 +1482,8 @@ struct nvmf_connect_command { 
};



enum {

	NVME_CONNECT_AUTHREQ_ASCR	= (1 << 2),

	NVME_CONNECT_AUTHREQ_ATR	= (1 << 1),

	NVME_CONNECT_AUTHREQ_ASCR	= (1U << 18),

	NVME_CONNECT_AUTHREQ_ATR	= (1U << 17),

};



struct nvmf_connect_data {