Commit cead0b89 authored by Anuj Gupta's avatar Anuj Gupta Committed by Keith Busch
Browse files

nvme: rename apptag and appmask to lbat and lbatm 



Rename apptag and appmask to lbat and lbatm so that it matches the field
names used in NVMe spec.

Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Signed-off-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 03c3d7c7

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -987,8 +987,8 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, 
	cmnd->rw.length =

		cpu_to_le16((blk_rq_bytes(req) >> ns->head->lba_shift) - 1);

	cmnd->rw.reftag = 0;

	cmnd->rw.apptag = 0;

	cmnd->rw.appmask = 0;

	cmnd->rw.lbat = 0;

	cmnd->rw.lbatm = 0;



	if (ns->head->ms) {

		/*

drivers/nvme/host/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	c.rw.control = cpu_to_le16(io.control);

	c.rw.dsmgmt = cpu_to_le32(io.dsmgmt);

	c.rw.reftag = cpu_to_le32(io.reftag);

	c.rw.apptag = cpu_to_le16(io.apptag);

	c.rw.appmask = cpu_to_le16(io.appmask);

	c.rw.lbat = cpu_to_le16(io.apptag);

	c.rw.lbatm = cpu_to_le16(io.appmask);



	return nvme_submit_user_cmd(ns->queue, &c, io.addr, length, metadata,

			meta_len, lower_32_bits(io.slba), NULL, 0, 0);

drivers/nvme/host/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -1363,8 +1363,8 @@ static void nvme_rdma_set_sig_domain(struct blk_integrity *bi, 
	if (control & NVME_RW_PRINFO_PRCHK_REF)

		domain->sig.dif.ref_remap = true;



	domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.apptag);

	domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.appmask);

	domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.lbat);

	domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.lbatm);

	domain->sig.dif.app_escape = true;

	if (pi_type == NVME_NS_DPS_PI_TYPE3)

		domain->sig.dif.ref_escape = true;

drivers/nvme/target/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -578,8 +578,8 @@ static void nvmet_rdma_set_sig_domain(struct blk_integrity *bi, 
	if (control & NVME_RW_PRINFO_PRCHK_REF)

		domain->sig.dif.ref_remap = true;



	domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.apptag);

	domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.appmask);

	domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.lbat);

	domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.lbatm);

	domain->sig.dif.app_escape = true;

	if (pi_type == NVME_NS_DPS_PI_TYPE3)

		domain->sig.dif.ref_escape = true;

include/linux/nvme.h

+4 −4
Original line number Diff line number Diff line
@@ -987,8 +987,8 @@ struct nvme_rw_command { 
	__le16			control;

	__le32			dsmgmt;

	__le32			reftag;

	__le16			apptag;

	__le16			appmask;

	__le16			lbat;

	__le16			lbatm;

};



enum {
@@ -1057,8 +1057,8 @@ struct nvme_write_zeroes_cmd { 
	__le16			control;

	__le32			dsmgmt;

	__le32			reftag;

	__le16			apptag;

	__le16			appmask;

	__le16			lbat;

	__le16			lbatm;

};



enum nvme_zone_mgmt_action {