Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anuj Gupta and committed by
Keith Busch
cead0b89 03c3d7c7

+12 -12
+2 -2
drivers/nvme/host/core.c
··· 987 987 cmnd->rw.length = 988 988 cpu_to_le16((blk_rq_bytes(req) >> ns->head->lba_shift) - 1); 989 989 cmnd->rw.reftag = 0; 990 - cmnd->rw.apptag = 0; 991 - cmnd->rw.appmask = 0; 990 + cmnd->rw.lbat = 0; 991 + cmnd->rw.lbatm = 0; 992 992 993 993 if (ns->head->ms) { 994 994 /*
+2 -2
drivers/nvme/host/ioctl.c
··· 260 260 c.rw.control = cpu_to_le16(io.control); 261 261 c.rw.dsmgmt = cpu_to_le32(io.dsmgmt); 262 262 c.rw.reftag = cpu_to_le32(io.reftag); 263 - c.rw.apptag = cpu_to_le16(io.apptag); 264 - c.rw.appmask = cpu_to_le16(io.appmask); 263 + c.rw.lbat = cpu_to_le16(io.apptag); 264 + c.rw.lbatm = cpu_to_le16(io.appmask); 265 265 266 266 return nvme_submit_user_cmd(ns->queue, &c, io.addr, length, metadata, 267 267 meta_len, lower_32_bits(io.slba), NULL, 0, 0);
+2 -2
drivers/nvme/host/rdma.c
··· 1363 1363 if (control & NVME_RW_PRINFO_PRCHK_REF) 1364 1364 domain->sig.dif.ref_remap = true; 1365 1365 1366 - domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.apptag); 1367 - domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.appmask); 1366 + domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.lbat); 1367 + domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.lbatm); 1368 1368 domain->sig.dif.app_escape = true; 1369 1369 if (pi_type == NVME_NS_DPS_PI_TYPE3) 1370 1370 domain->sig.dif.ref_escape = true;
+2 -2
drivers/nvme/target/rdma.c
··· 578 578 if (control & NVME_RW_PRINFO_PRCHK_REF) 579 579 domain->sig.dif.ref_remap = true; 580 580 581 - domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.apptag); 582 - domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.appmask); 581 + domain->sig.dif.app_tag = le16_to_cpu(cmd->rw.lbat); 582 + domain->sig.dif.apptag_check_mask = le16_to_cpu(cmd->rw.lbatm); 583 583 domain->sig.dif.app_escape = true; 584 584 if (pi_type == NVME_NS_DPS_PI_TYPE3) 585 585 domain->sig.dif.ref_escape = true;
+4 -4
include/linux/nvme.h
··· 987 987 __le16 control; 988 988 __le32 dsmgmt; 989 989 __le32 reftag; 990 - __le16 apptag; 991 - __le16 appmask; 990 + __le16 lbat; 991 + __le16 lbatm; 992 992 }; 993 993 994 994 enum { ··· 1057 1057 __le16 control; 1058 1058 __le32 dsmgmt; 1059 1059 __le32 reftag; 1060 - __le16 apptag; 1061 - __le16 appmask; 1060 + __le16 lbat; 1061 + __le16 lbatm; 1062 1062 }; 1063 1063 1064 1064 enum nvme_zone_mgmt_action {