Revert "ioctl: return EPROTO when an NVMe status occurred"

This reverts commit 3089da5. 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 <[email protected]>
linux-nvme · Apr 12, 2024 · 93b2877 · 93b2877
1 parent 7cf916f
commit 93b2877
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/src/nvme/ioctl.c b/src/nvme/ioctl.c
@@ -85,14 +85,8 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
 {
 	int err = ioctl(fd, ioctl_cmd, cmd);
 
-	if (err >= 0) {
-		if (result)
-			*result = cmd->result;
-		if (cmd->result) {
-			errno = EPROTO;
-			err = -1;
-		}
-	}
+	if (err >= 0 && result)
+		*result = cmd->result;
 	return err;
 }
 
@@ -102,14 +96,8 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
 {
 	int err = ioctl(fd, ioctl_cmd, cmd);
 
-	if (err >= 0) {
-		if (result)
-			*result = cmd->result;
-		if (cmd->result) {
-			errno = EPROTO;
-			err = -1;
-		}
-	}
+	if (err >= 0 && result)
+		*result = cmd->result;
 	return err;
 }
 

diff --git a/test/ioctl/features.c b/test/ioctl/features.c
@@ -17,7 +17,7 @@
 #define TEST_CDW15 0x15151515
 #define TEST_UUIDX 0b1001110
 #define TEST_FID 0xFE
-#define TEST_RESULT 0x0
+#define TEST_RESULT 0x12345678
 #define TEST_SEL NVME_GET_FEATURES_SEL_SAVED
 #define TEST_SC NVME_SC_INVALID_FIELD