Revert "ioctl: add nvme_set_features_iocs_profile2()"

This reverts commit cb9bdfd4f15305b5d2868aea7f642e211e5a2f36.

The result field is undefined for many commands and thus can have random values.
Thus we can't blindly evaluate these for all commands.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/src/libnvme.map b/src/libnvme.map
index e5dd410d5c2e0d5b8361b983d3f81f2501f2dab6..85f4a4a17a589bbab6c42a322fc6057f9ef34ff9 100644 (file)
--- a/src/libnvme.map
+++ b/src/libnvme.map
@@ -13,7 +13,6 @@ LIBNVME_1.9 {
                nvme_set_features_timestamp2;
                nvme_set_features_host_behavior2;
                nvme_set_features_host_id2;
-               nvme_set_features_iocs_profile2;
 };
 
 LIBNVME_1_8 {

diff --git a/src/nvme/ioctl.c b/src/nvme/ioctl.c
index 34080274a41d4e8df33f2c749fb00a4e30cf3256..dfd17e46d78eca1efd91ed6b32f4daf77693c181 100644 (file)
--- a/src/nvme/ioctl.c
+++ b/src/nvme/ioctl.c
@@ -793,25 +793,11 @@ int nvme_set_features_write_protect2(int fd, __u32 nsid,
 }
 
 int nvme_set_features_iocs_profile(int fd, __u16 iocsi, bool save)
-{
-       __u32 value = NVME_SET(iocsi, FEAT_IOCSP_IOCSCI);
-       __u32 result = 0;
-       int err;
-
-       err = __nvme_set_features(fd, NVME_FEAT_FID_IOCS_PROFILE, value,
-                                 save, &result);
-       if (err && result)
-               err = result;
-       return err;
-}
-
-int nvme_set_features_iocs_profile2(int fd, __u16 iocsi, bool save,
-                                   __u32 *result)
 {
        __u32 value = NVME_SET(iocsi, FEAT_IOCSP_IOCSCI);
 
        return __nvme_set_features(fd, NVME_FEAT_FID_IOCS_PROFILE, value,
-                                  save, result);
+                                  save, NULL);
 }
 
 int nvme_get_features(struct nvme_get_features_args *args)

diff --git a/src/nvme/ioctl.h b/src/nvme/ioctl.h
index f0d2a70fbfe6eae1ebb4e1003ae257bb5de9f068..6978a1f6dade85caaba5bdc3e4c4b53bc42248ac 100644 (file)
--- a/src/nvme/ioctl.h
+++ b/src/nvme/ioctl.h
@@ -3023,19 +3023,6 @@ int nvme_set_features_write_protect2(int fd, __u32 nsid,
  */
 int nvme_set_features_iocs_profile(int fd, __u16 iocsi, bool save);
 
-/**
- * nvme_set_features_iocs_profile2() - Set I/O command set profile feature
- * @fd:                File descriptor of nvme device
- * @iocsi:     I/O Command Set Combination Index
- * @save:      Save value across power states
- * @result:    The command completion result from CQE dword0
- *
- * Return: 0 if the ioctl was successful, -1 with errno set to EPROTO when
- * a non-zero state is returned in @result, or -1 with errno set otherwise.
- */
-int nvme_set_features_iocs_profile2(int fd, __u16 iocsi, bool save,
-                                   __u32 *result);
-
 /**
  * nvme_get_features() - Retrieve a feature attribute
  * @args:      &struct nvme_get_features_args argument structure