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: Anuj Gupta <anuj20.g@samsung.com>
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Suggested-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 93aa4c10adb7320a2cebd233e6d6d70f7c27c79d..75ab62cb4aa454066082a011c67b575ed81ec723 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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) {
                /*

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index f1d58e70933f54ef8aee9c0908880f8d337fb1d0..850f81e08e7d81981b406bb867984f43bc060bde 100644 (file)
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -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);

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index e3520a91147b1027c2940dc3224316c186a7416f..15b5e06039a5f4d1c3c5d2352d14976089a007ac 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -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;

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 1eff8ca6a5f12a3c35976457fb95a2cfa3eaa882..1b6264fa580399a616a7fcc7a6074efc313a0f54 100644 (file)
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -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;

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 7b2ae2e435447f987f4e91e32b0e7bb15026a873..b58d9405d65e013e6e25371379ae6ae1419c0bd3 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -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 {