summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorWeiwen Hu <huweiwen@linux.alibaba.com>2024-06-03 20:57:01 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-09-12 11:13:13 +0200
commit2443c10be369aae4e4dadc0fb5fc80b809d28dd1 (patch)
tree23818ed1f49ffa34687720ad1cf30394b943d451 /include/linux
parentd433e595f1ac5783adff82adbc9219983f20df37 (diff)
nvme: rename CDR/MORE/DNR to NVME_STATUS_*
[ Upstream commit dd0b0a4a2c5d7209457dc172997d1243ad269cfa ] CDR/MORE/DNR fields are not belonging to SC in the NVMe spec, rename them to NVME_STATUS_* to avoid confusion. Signed-off-by: Weiwen Hu <huweiwen@linux.alibaba.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Keith Busch <kbusch@kernel.org> Stable-dep-of: 899d2e5a4e3d ("nvmet: Identify-Active Namespace ID List command should reject invalid nsid") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nvme.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index ed0d668e77c5..efda407622c1 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1996,9 +1996,9 @@ enum {
NVME_SCT_MASK = 0x0700, /* Status Code Type */
NVME_SCT_SC_MASK = NVME_SCT_MASK | NVME_SC_MASK,
- NVME_SC_CRD = 0x1800, /* Command Retry Delayed */
- NVME_SC_MORE = 0x2000,
- NVME_SC_DNR = 0x4000, /* Do Not Retry */
+ NVME_STATUS_CRD = 0x1800, /* Command Retry Delayed */
+ NVME_STATUS_MORE = 0x2000,
+ NVME_STATUS_DNR = 0x4000, /* Do Not Retry */
};
#define NVME_SCT(status) ((status) >> 8 & 7)