Revert "ioctl: add nvme_get_features_timestamp2()"

This reverts commit 5547b9350340328b2f7f37c52c8492a32554084d.

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 1a2b5a91137a21cb48ecaea13b634c0187b28f14..e5dd410d5c2e0d5b8361b983d3f81f2501f2dab6 100644 (file)
--- a/src/libnvme.map
+++ b/src/libnvme.map
@@ -14,7 +14,6 @@ LIBNVME_1.9 {
                nvme_set_features_host_behavior2;
                nvme_set_features_host_id2;
                nvme_set_features_iocs_profile2;
-               nvme_get_features_timestamp2;
 };
 
 LIBNVME_1_8 {

diff --git a/src/nvme/ioctl.c b/src/nvme/ioctl.c
index ab36a4b5b4b4628536f2ddc5c7cf7073ded23016..34080274a41d4e8df33f2c749fb00a4e30cf3256 100644 (file)
--- a/src/nvme/ioctl.c
+++ b/src/nvme/ioctl.c
@@ -1042,18 +1042,6 @@ int nvme_get_features_host_mem_buf2(int fd, enum nvme_get_features_sel sel,
 
 int nvme_get_features_timestamp(int fd, enum nvme_get_features_sel sel,
                                struct nvme_timestamp *ts)
-{
-       __u32 result = 0;
-       int err;
-
-       err = nvme_get_features_timestamp2(fd, sel, ts, &result);
-       if (err && result)
-               err = result;
-       return err;
-}
-
-int nvme_get_features_timestamp2(int fd, enum nvme_get_features_sel sel,
-                                struct nvme_timestamp *ts, __u32 *result)
 {
        struct nvme_get_features_args args = {
                .args_size = sizeof(args),
@@ -1066,7 +1054,7 @@ int nvme_get_features_timestamp2(int fd, enum nvme_get_features_sel sel,
                .data_len = sizeof(*ts),
                .data = ts,
                .timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-               .result = result,
+               .result = NULL,
        };
 
        return nvme_get_features(&args);

diff --git a/src/nvme/ioctl.h b/src/nvme/ioctl.h
index 5f234e7000d80fc021bc226cc06ba5511d3f323e..f0d2a70fbfe6eae1ebb4e1003ae257bb5de9f068 100644 (file)
--- a/src/nvme/ioctl.h
+++ b/src/nvme/ioctl.h
@@ -3318,20 +3318,6 @@ int nvme_get_features_host_mem_buf2(int fd, enum nvme_get_features_sel sel,
 int nvme_get_features_timestamp(int fd, enum nvme_get_features_sel sel,
                                struct nvme_timestamp *ts);
 
-/**
- * nvme_get_features_timestamp2() - Get timestamp feature
- * @fd:                File descriptor of nvme device
- * @sel:       Select which type of attribute to return, see
- *             &enum nvme_get_features_sel
- * @ts:                Current timestamp
- * @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_get_features_timestamp2(int fd, enum nvme_get_features_sel sel,
-                                struct nvme_timestamp *ts, __u32 *result);
-
 /**
  * nvme_get_features_kato() - Get keep alive timeout feature
  * @fd:                File descriptor of nvme device