Skip to content

Commit 2803378

Browse files
sc108-leedwsuse
sc108-lee
authored and
dwsuse
committed
nvme: get log domain id included in Log Specific Identifier
domid was not used in nvme_get_log as well Signed-off-by: Steven Seungcheol Lee <[email protected]>
1 parent b4cb6a0 commit 2803378

2 files changed

Lines changed: 3 additions & 24 deletions

File tree

‎src/nvme/ioctl.h‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,8 +1182,7 @@ static inline int nvme_zns_identify_ctrl(int fd, struct nvme_zns_id_ctrl *id)
11821182
* @len: Length of provided user buffer to hold the log data in bytes
11831183
* @nsid: Namespace identifier, if applicable
11841184
* @csi: Command set identifier, see &enum nvme_csi for known values
1185-
* @lsi: Endurance group information
1186-
* @domid: Domain Identifier selection, if supported
1185+
* @lsi: Log Specific Identifier
11871186
* @lsp: Log specific field
11881187
* @uuidx: UUID selection, if supported
11891188
* @rae: Retain asynchronous events
@@ -1203,7 +1202,6 @@ struct nvme_get_log_args {
12031202
__u32 nsid;
12041203
enum nvme_csi csi;
12051204
__u16 lsi;
1206-
__u16 domid;
12071205
__u8 lsp;
12081206
__u8 uuidx;
12091207
bool rae;
@@ -1235,7 +1233,6 @@ static inline int nvme_get_nsid_log(int fd, bool rae,
12351233
.nsid = nsid,
12361234
.csi = NVME_CSI_NVM,
12371235
.lsi = NVME_LOG_LSI_NONE,
1238-
.domid = NVME_DOMID_NONE,
12391236
.lsp = NVME_LOG_LSP_NONE,
12401237
.uuidx = NVME_UUID_NONE,
12411238
.rae = false,
@@ -1380,7 +1377,6 @@ static inline int nvme_get_log_cmd_effects(int fd, enum nvme_csi csi,
13801377
.nsid = NVME_NSID_ALL,
13811378
.csi = csi,
13821379
.lsi = NVME_LOG_LSI_NONE,
1383-
.domid = NVME_DOMID_NONE,
13841380
.lsp = NVME_LOG_LSP_NONE,
13851381
.uuidx = NVME_UUID_NONE,
13861382
.rae = false,
@@ -1428,7 +1424,6 @@ static inline int nvme_get_log_create_telemetry_host(int fd,
14281424
.nsid = NVME_NSID_NONE,
14291425
.csi = NVME_CSI_NVM,
14301426
.lsi = NVME_LOG_LSI_NONE,
1431-
.domid = NVME_DOMID_NONE,
14321427
.lsp = NVME_LOG_TELEM_HOST_LSP_CREATE,
14331428
.uuidx = NVME_UUID_NONE,
14341429
.rae = false,
@@ -1465,7 +1460,6 @@ static inline int nvme_get_log_telemetry_host(int fd, __u64 offset,
14651460
.nsid = NVME_NSID_NONE,
14661461
.csi = NVME_CSI_NVM,
14671462
.lsi = NVME_LOG_LSI_NONE,
1468-
.domid = NVME_DOMID_NONE,
14691463
.lsp = NVME_LOG_TELEM_HOST_LSP_RETAIN,
14701464
.uuidx = NVME_UUID_NONE,
14711465
.rae = false,
@@ -1497,7 +1491,6 @@ static inline int nvme_get_log_telemetry_ctrl(int fd, bool rae,
14971491
.nsid = NVME_NSID_NONE,
14981492
.csi = NVME_CSI_NVM,
14991493
.lsi = NVME_LOG_LSI_NONE,
1500-
.domid = NVME_DOMID_NONE,
15011494
.lsp = NVME_LOG_LSP_NONE,
15021495
.uuidx = NVME_UUID_NONE,
15031496
.rae = rae,
@@ -1537,7 +1530,6 @@ static inline int nvme_get_log_endurance_group(int fd, __u16 endgid,
15371530
.nsid = NVME_NSID_NONE,
15381531
.csi = NVME_CSI_NVM,
15391532
.lsi = endgid,
1540-
.domid = NVME_DOMID_NONE,
15411533
.lsp = NVME_LOG_LSP_NONE,
15421534
.uuidx = NVME_UUID_NONE,
15431535
.rae = false,
@@ -1570,7 +1562,6 @@ static inline int nvme_get_log_predictable_lat_nvmset(int fd, __u16 nvmsetid,
15701562
.nsid = NVME_NSID_NONE,
15711563
.csi = NVME_CSI_NVM,
15721564
.lsi = nvmsetid,
1573-
.domid = NVME_DOMID_NONE,
15741565
.lsp = NVME_LOG_LSP_NONE,
15751566
.uuidx = NVME_UUID_NONE,
15761567
.rae = false,
@@ -1602,7 +1593,6 @@ static inline int nvme_get_log_predictable_lat_event(int fd, bool rae,
16021593
.nsid = NVME_NSID_NONE,
16031594
.csi = NVME_CSI_NVM,
16041595
.lsi = NVME_LOG_LSI_NONE,
1605-
.domid = NVME_DOMID_NONE,
16061596
.lsp = NVME_LOG_LSP_NONE,
16071597
.uuidx = NVME_UUID_NONE,
16081598
.rae = rae,
@@ -1644,7 +1634,6 @@ static int nvme_get_log_ana(int fd, enum nvme_log_ana_lsp lsp, bool rae,
16441634
.nsid = NVME_NSID_NONE,
16451635
.csi = NVME_CSI_NVM,
16461636
.lsi = NVME_LOG_LSI_NONE,
1647-
.domid = NVME_DOMID_NONE,
16481637
.lsp = lsp,
16491638
.uuidx = NVME_UUID_NONE,
16501639
.rae = false,
@@ -1692,7 +1681,6 @@ static inline int nvme_get_log_lba_status(int fd, bool rae,
16921681
.nsid = NVME_NSID_NONE,
16931682
.csi = NVME_CSI_NVM,
16941683
.lsi = NVME_LOG_LSI_NONE,
1695-
.domid = NVME_DOMID_NONE,
16961684
.lsp = NVME_LOG_LSP_NONE,
16971685
.uuidx = NVME_UUID_NONE,
16981686
.rae = rae,
@@ -1724,7 +1712,6 @@ static inline int nvme_get_log_endurance_grp_evt(int fd, bool rae,
17241712
.nsid = NVME_NSID_NONE,
17251713
.csi = NVME_CSI_NVM,
17261714
.lsi = NVME_LOG_LSI_NONE,
1727-
.domid = NVME_DOMID_NONE,
17281715
.lsp = NVME_LOG_LSP_NONE,
17291716
.uuidx = NVME_UUID_NONE,
17301717
.rae = rae,
@@ -1776,7 +1763,6 @@ static inline int nvme_get_log_boot_partition(int fd, bool rae,
17761763
.nsid = NVME_NSID_NONE,
17771764
.csi = NVME_CSI_NVM,
17781765
.lsi = NVME_LOG_LSI_NONE,
1779-
.domid = NVME_DOMID_NONE,
17801766
.lsp = NVME_LOG_LSP_NONE,
17811767
.uuidx = NVME_UUID_NONE,
17821768
.rae = rae,
@@ -1814,7 +1800,6 @@ static inline int nvme_get_log_discovery(int fd, bool rae,
18141800
.nsid = NVME_NSID_NONE,
18151801
.csi = NVME_CSI_NVM,
18161802
.lsi = NVME_LOG_LSI_NONE,
1817-
.domid = NVME_DOMID_NONE,
18181803
.lsp = NVME_LOG_LSP_NONE,
18191804
.uuidx = NVME_UUID_NONE,
18201805
.rae = rae,
@@ -1846,8 +1831,7 @@ static inline int nvme_get_log_media_unit_stat(int fd, __u16 domid,
18461831
.len = sizeof(*mus),
18471832
.nsid = NVME_NSID_NONE,
18481833
.csi = NVME_CSI_NVM,
1849-
.lsi = NVME_LOG_LSI_NONE,
1850-
.domid = domid,
1834+
.lsi = domid,
18511835
.lsp = NVME_LOG_LSP_NONE,
18521836
.uuidx = NVME_UUID_NONE,
18531837
.rae = false,
@@ -1878,8 +1862,7 @@ static inline int nvme_get_log_support_cap_config_list(int fd, __u16 domid,
18781862
.len = sizeof(*cap),
18791863
.nsid = NVME_NSID_NONE,
18801864
.csi = NVME_CSI_NVM,
1881-
.lsi = NVME_LOG_LSI_NONE,
1882-
.domid = domid,
1865+
.lsi = domid,
18831866
.lsp = NVME_LOG_LSP_NONE,
18841867
.uuidx = NVME_UUID_NONE,
18851868
.rae = false,
@@ -1947,7 +1930,6 @@ static inline int nvme_get_log_zns_changed_zones(int fd, __u32 nsid, bool rae,
19471930
.nsid = nsid,
19481931
.csi = NVME_CSI_ZNS,
19491932
.lsi = NVME_LOG_LSI_NONE,
1950-
.domid = NVME_DOMID_NONE,
19511933
.lsp = NVME_LOG_LSP_NONE,
19521934
.uuidx = NVME_UUID_NONE,
19531935
.rae = rae,
@@ -1979,7 +1961,6 @@ static inline int nvme_get_log_persistent_event(int fd,
19791961
.nsid = NVME_NSID_ALL,
19801962
.csi = NVME_CSI_NVM,
19811963
.lsi = NVME_LOG_LSI_NONE,
1982-
.domid = NVME_DOMID_NONE,
19831964
.lsp = NVME_LOG_LSP_NONE,
19841965
.uuidx = NVME_UUID_NONE,
19851966
.rae = false,

‎src/nvme/types.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
* @NVME_UUID_NONE: Use to omit a uuid command parameter
5555
* @NVME_CNTLID_NONE: Use to omit a cntlid command parameter
5656
* @NVME_CNSSPECID_NONE: Use to omit a cns_specific_id command parameter
57-
* @NVME_DOMID_NONE: Use to omit a domid command parameter
5857
* @NVME_LOG_LSP_NONE: Use to omit a log lsp command parameter
5958
* @NVME_LOG_LSI_NONE: Use to omit a log lsi command parameter
6059
* @NVME_LOG_LPO_NONE: Use to omit a log lpo command parameter
@@ -99,7 +98,6 @@ enum nvme_constants {
9998
NVME_UUID_NONE = 0,
10099
NVME_CNTLID_NONE = 0,
101100
NVME_CNSSPECID_NONE = 0,
102-
NVME_DOMID_NONE = 0,
103101
NVME_LOG_LSP_NONE = 0,
104102
NVME_LOG_LSI_NONE = 0,
105103
NVME_LOG_LPO_NONE = 0,

0 commit comments

Comments
 (0)