This makes the code more readable. Signed-off-by: Max Gurtovoy <mgurtovoy@xxxxxxxxxx> --- drivers/nvme/host/core.c | 12 ++++++------ include/linux/nvme.h | 12 ++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 3f1a7dc2a2a3..50668e1bd9f1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2068,17 +2068,17 @@ static char nvme_pr_type(enum pr_type type) { switch (type) { case PR_WRITE_EXCLUSIVE: - return 1; + return NVME_PR_WRITE_EXCLUSIVE; case PR_EXCLUSIVE_ACCESS: - return 2; + return NVME_PR_EXCLUSIVE_ACCESS; case PR_WRITE_EXCLUSIVE_REG_ONLY: - return 3; + return NVME_PR_WRITE_EXCLUSIVE_REG_ONLY; case PR_EXCLUSIVE_ACCESS_REG_ONLY: - return 4; + return NVME_PR_EXCLUSIVE_ACCESS_REG_ONLY; case PR_WRITE_EXCLUSIVE_ALL_REGS: - return 5; + return NVME_PR_WRITE_EXCLUSIVE_ALL_REGS; case PR_EXCLUSIVE_ACCESS_ALL_REGS: - return 6; + return NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS; default: return 0; } diff --git a/include/linux/nvme.h b/include/linux/nvme.h index ae53d74f3696..a925be0056f2 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -238,6 +238,18 @@ enum { NVME_CAP_CRMS_CRIMS = 1ULL << 60, }; +/* + * Reservation Type Encoding + */ +enum { + NVME_PR_WRITE_EXCLUSIVE = 1, /* Write Exclusive Reservation */ + NVME_PR_EXCLUSIVE_ACCESS = 2, /* Exclusive Access Reservation */ + NVME_PR_WRITE_EXCLUSIVE_REG_ONLY = 3, /* Write Exclusive - Registrants Only Reservation */ + NVME_PR_EXCLUSIVE_ACCESS_REG_ONLY = 4, /* Exclusive Access - Registrants Only Reservation */ + NVME_PR_WRITE_EXCLUSIVE_ALL_REGS = 5, /* Write Exclusive - All Registrants Reservation */ + NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS = 6, /* Exclusive Access - All Registrants Reservation */ +}; + struct nvme_id_power_state { __le16 max_power; /* centiwatts */ __u8 rsvd2; -- 2.18.1