Skip to content

Commit 7557c48

Browse files
authored
Merge pull request #201 from Arunpandian15/types_h_cleanup
Clean up Patch for types.h, ioctl.h
2 parents 20cc76c + 909a13f commit 7557c48

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

src/nvme/ioctl.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,6 @@ static inline int nvme_get_log_error(int fd, unsigned nr_entries, bool rae,
12271227
NVME_NSID_ALL, sizeof(*log) * nr_entries, log);
12281228
}
12291229

1230-
12311230
/**
12321231
* nvme_get_log_smart() - Retrieve nvme smart log
12331232
* @fd: File descriptor of nvme device
@@ -1272,7 +1271,6 @@ static inline int nvme_get_log_fw_slot(int fd, bool rae,
12721271
NVME_NSID_ALL, sizeof(*log), log);
12731272
}
12741273

1275-
12761274
/**
12771275
* nvme_get_log_changed_ns_list() - Retrieve namespace changed list
12781276
* @fd: File descriptor of nvme device
@@ -1293,7 +1291,6 @@ static inline int nvme_get_log_changed_ns_list(int fd, bool rae,
12931291
NVME_NSID_ALL, sizeof(*log), log);
12941292
}
12951293

1296-
12971294
/**
12981295
* nvme_get_log_cmd_effects() - Retrieve nvme command effects log
12991296
* @fd: File descriptor of nvme device
@@ -1350,7 +1347,6 @@ static inline int nvme_get_log_device_self_test(int fd,
13501347
NVME_NSID_ALL, sizeof(*log), log);
13511348
}
13521349

1353-
13541350
/**
13551351
* nvme_get_log_create_telemetry_host() -
13561352
*/
@@ -1378,7 +1374,6 @@ static inline int nvme_get_log_create_telemetry_host(int fd,
13781374
return nvme_get_log(&args);
13791375
}
13801376

1381-
13821377
/**
13831378
* nvme_get_log_telemetry_host() -
13841379
* @fd: File descriptor of nvme device
@@ -1590,7 +1585,6 @@ static int nvme_get_log_ana(int fd, enum nvme_log_ana_lsp lsp, bool rae,
15901585
return nvme_get_log(&args);
15911586
}
15921587

1593-
15941588
/**
15951589
* nvme_get_log_ana_groups() -
15961590
* @fd: File descriptor of nvme device
@@ -1605,7 +1599,6 @@ static inline int nvme_get_log_ana_groups(int fd, bool rae, __u32 len,
16051599
len, log);
16061600
}
16071601

1608-
16091602
/**
16101603
* nvme_get_log_lba_status() -
16111604
* @fd: File descriptor of nvme device
@@ -1680,7 +1673,6 @@ static inline int nvme_get_log_fid_supported_effects(int fd, bool rae,
16801673
NVME_NSID_NONE, sizeof(*log), log);
16811674
}
16821675

1683-
16841676
/**
16851677
* nvme_get_log_boot_partition() -
16861678
* @fd: File descriptor of nvme device
@@ -1716,7 +1708,6 @@ static inline int nvme_get_log_boot_partition(int fd, bool rae,
17161708
return nvme_get_log(&args);
17171709
}
17181710

1719-
17201711
/**
17211712
* nvme_get_log_discovery() -
17221713
* @fd: File descriptor of nvme device
@@ -1755,7 +1746,6 @@ static inline int nvme_get_log_discovery(int fd, bool rae,
17551746
return nvme_get_log(&args);
17561747
}
17571748

1758-
17591749
/**
17601750
* nvme_get_log_media_unit_stat() -
17611751
* @fd: File descriptor of nvme device
@@ -1788,7 +1778,6 @@ static inline int nvme_get_log_media_unit_stat(int fd, __u16 domid,
17881778
return nvme_get_log(&args);
17891779
}
17901780

1791-
17921781
/**
17931782
* nvme_get_log_reservation() -
17941783
* @fd: File descriptor of nvme device
@@ -1801,7 +1790,6 @@ static inline int nvme_get_log_reservation(int fd, bool rae,
18011790
NVME_NSID_ALL, sizeof(*log), log);
18021791
}
18031792

1804-
18051793
/**
18061794
* nvme_get_log_sanitize() -
18071795
* @fd: File descriptor of nvme device
@@ -1821,7 +1809,6 @@ static inline int nvme_get_log_sanitize(int fd, bool rae,
18211809
NVME_NSID_ALL, sizeof(*log), log);
18221810
}
18231811

1824-
18251812
/**
18261813
* nvme_get_log_zns_changed_zones() -
18271814
* @fd: File descriptor of nvme device
@@ -1858,7 +1845,6 @@ static inline int nvme_get_log_zns_changed_zones(int fd, __u32 nsid, bool rae,
18581845
return nvme_get_log(&args);
18591846
}
18601847

1861-
18621848
/**
18631849
* nvme_get_log_persistent_event() -
18641850
* @fd: File descriptor of nvme device
@@ -1891,7 +1877,6 @@ static inline int nvme_get_log_persistent_event(int fd,
18911877
return nvme_get_log(&args);
18921878
}
18931879

1894-
18951880
/**
18961881
* nvme_set_features_args - Arguments for the NVMe Admin Set Feature command
18971882
* @fd: File descriptor of nvme device
@@ -2229,7 +2214,6 @@ int nvme_set_features_endurance_evt_cfg(int fd, __u16 endgid, __u8 egwarn,
22292214
int nvme_set_features_sw_progress(int fd, __u8 pbslc, bool save,
22302215
__u32 *result);
22312216

2232-
22332217
/**
22342218
* nvme_set_features_host_id() -
22352219
* @fd: File descriptor of nvme device
@@ -2376,6 +2360,7 @@ int nvme_get_features_power_mgmt(int fd, enum nvme_get_features_sel sel,
23762360
int nvme_get_features_lba_range(int fd, enum nvme_get_features_sel sel,
23772361
struct nvme_lba_range_type *data,
23782362
__u32 *result);
2363+
23792364
/**
23802365
* nvme_get_features_temp_thresh() -
23812366
* @fd: File descriptor of nvme device
@@ -3351,7 +3336,6 @@ static inline int nvme_directive_recv_stream_allocate(int fd, __u32 nsid,
33513336
return nvme_directive_recv(&args);
33523337
}
33533338

3354-
33553339
/**
33563340
* nvme_capacity_mgmt_args - Arguments for the NVMe Capacity Management command
33573341
* @fd: File descriptor of nvme device

src/nvme/types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3923,6 +3923,7 @@ enum nvme_ae_type {
39233923
NVME_AER_CSS = 6,
39243924
NVME_AER_VS = 7,
39253925
};
3926+
39263927
/**
39273928
* enum nvme_ae_info_error -
39283929
* @NVME_AER_ERROR_INVALID_DB_REG:

0 commit comments

Comments
 (0)