Skip to content

Commit 8eaf8e4

Browse files
committed
nvme: Fix typo in BD_NVME_SANITIZE_STATUS_IN_PROG*R*ESS
Unfortunately we need to keep the "progess" member as well now.
1 parent fff8287 commit 8eaf8e4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/lib/plugin_apis/nvme.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ typedef enum {
886886
/**
887887
* BDNVMESanitizeStatus:
888888
* @BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED: The NVM subsystem has never been sanitized.
889-
* @BD_NVME_SANITIZE_STATUS_IN_PROGESS: A sanitize operation is currently in progress.
889+
* @BD_NVME_SANITIZE_STATUS_IN_PROGRESS: A sanitize operation is currently in progress.
890890
* @BD_NVME_SANITIZE_STATUS_SUCCESS: The most recent sanitize operation completed successfully including any additional media modification.
891891
* @BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC: The most recent sanitize operation for which No-Deallocate After Sanitize was requested has completed successfully with deallocation of all user data.
892892
* @BD_NVME_SANITIZE_STATUS_FAILED: The most recent sanitize operation failed.
@@ -895,6 +895,7 @@ typedef enum {
895895
typedef enum {
896896
BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED = 0,
897897
BD_NVME_SANITIZE_STATUS_IN_PROGESS = 1,
898+
BD_NVME_SANITIZE_STATUS_IN_PROGRESS = BD_NVME_SANITIZE_STATUS_IN_PROGESS,
898899
BD_NVME_SANITIZE_STATUS_SUCCESS = 2,
899900
BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC = 3,
900901
BD_NVME_SANITIZE_STATUS_FAILED = 4,

src/plugins/nvme/nvme-info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ BDNVMESanitizeLog * bd_nvme_get_sanitize_log (const gchar *device, GError **erro
11471147
log->sanitize_status = BD_NVME_SANITIZE_STATUS_SUCCESS;
11481148
break;
11491149
case NVME_SANITIZE_SSTAT_STATUS_IN_PROGESS:
1150-
log->sanitize_status = BD_NVME_SANITIZE_STATUS_IN_PROGESS;
1150+
log->sanitize_status = BD_NVME_SANITIZE_STATUS_IN_PROGRESS;
11511151
break;
11521152
case NVME_SANITIZE_SSTAT_STATUS_COMPLETED_FAILED:
11531153
log->sanitize_status = BD_NVME_SANITIZE_STATUS_FAILED;

src/plugins/nvme/nvme.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,15 @@ typedef enum {
468468
/**
469469
* BDNVMESanitizeStatus:
470470
* @BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED: The NVM subsystem has never been sanitized.
471-
* @BD_NVME_SANITIZE_STATUS_IN_PROGESS: A sanitize operation is currently in progress.
471+
* @BD_NVME_SANITIZE_STATUS_IN_PROGRESS: A sanitize operation is currently in progress.
472472
* @BD_NVME_SANITIZE_STATUS_SUCCESS: The most recent sanitize operation completed successfully including any additional media modification.
473473
* @BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC: The most recent sanitize operation for which No-Deallocate After Sanitize was requested has completed successfully with deallocation of all user data.
474474
* @BD_NVME_SANITIZE_STATUS_FAILED: The most recent sanitize operation failed.
475475
*/
476476
typedef enum {
477477
BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED = 0,
478478
BD_NVME_SANITIZE_STATUS_IN_PROGESS = 1,
479+
BD_NVME_SANITIZE_STATUS_IN_PROGRESS = BD_NVME_SANITIZE_STATUS_IN_PROGESS,
479480
BD_NVME_SANITIZE_STATUS_SUCCESS = 2,
480481
BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC = 3,
481482
BD_NVME_SANITIZE_STATUS_FAILED = 4,

0 commit comments

Comments
 (0)