Revert "fix: correct inverted status checks in the SCSI tape backend (#626)

Author: rangelmx

src/tape_drivers/linux/sg/sg_tape.c

@@ -4630,9 +4630,7 @@ static bool is_ame(void *device)
 	unsigned char buf[TC_MP_READ_WRITE_CTRL_SIZE] = {0};
 	const int ret = sg_modesense(device, TC_MP_READ_WRITE_CTRL, TC_MP_PC_CURRENT, 0, buf, sizeof(buf));
 
-	/* sg_modesense returns the transferred byte count (> 0) on success and a
-	 * negative error code on failure. */
-	if (ret < 0) {
+	if (ret != 0) {
 		char message[100] = {0};
 		sprintf(message, "failed to get MP %02Xh (%d)", TC_MP_READ_WRITE_CTRL, ret);
 		ltfsmsg(LTFS_DEBUG, 30392D, __FUNCTION__, message);
@@ -4722,7 +4720,7 @@ int sg_set_key(void *device, const unsigned char *keyalias, const unsigned char
 
 	unsigned char buf[TC_MP_READ_WRITE_CTRL_SIZE] = {0};
 	ret = sg_modesense(device, TC_MP_READ_WRITE_CTRL, TC_MP_PC_CURRENT, 0, buf, sizeof(buf));
-	if (ret < 0)  /* sg_modesense returns a byte count (> 0) on success */
+	if (ret != DEVICE_GOOD)
 		goto out;
 
 	ltfs_u16tobe(buffer + 0, sps);
@@ -4769,9 +4767,8 @@ int sg_set_key(void *device, const unsigned char *keyalias, const unsigned char
 
 	memset(buf, 0, sizeof(buf));
 	ret = sg_modesense(device, TC_MP_READ_WRITE_CTRL, TC_MP_PC_CURRENT, 0, buf, sizeof(buf));
-	if (ret < 0)  /* sg_modesense returns a byte count (> 0) on success */
+	if (ret != DEVICE_GOOD)
 		goto out;
-	ret = DEVICE_GOOD; /* normalize the byte count to a success code */
 
 free:
 	free(buffer);

src/tape_drivers/osx/iokit/iokit_tape.c

@@ -285,7 +285,7 @@ static int _get_dump(struct iokit_data *priv, char *fname)
 	long long               data_length, buf_offset;
 	int                     dumpfd = -1;
 	int                     transfer_size, num_transfers, excess_transfer;
-	int                     bytes;
+	int                     i, bytes;
 	unsigned char           cap_buf[DUMP_HEADER_SIZE];
 	unsigned char           *dump_buf;
 	int                     buf_id;
@@ -331,11 +331,14 @@ static int _get_dump(struct iokit_data *priv, char *fname)
 
 	/* start to transfer data */
 	buf_offset = 0;
+	i = 0;
 	ltfsmsg(LTFS_DEBUG, 30859D);
 	while(num_transfers)
 	{
 		int length;
 
+		i++;
+
 		/* Allocation Length is transfer_size or excess_transfer*/
 		if(excess_transfer && num_transfers == 1)
 			length = excess_transfer;
@@ -3409,9 +3412,7 @@ int iokit_set_xattr(void *device, const char *name, const char *buf, size_t size
 	free(null_terminated);
 
 	ltfs_profiler_add_entry(priv->profiler, NULL, TAPEBEND_REQ_EXIT(REQ_TC_SETXATTR));
-	/* ret is DEVICE_GOOD when one of the vendor attributes matched above;
-	 * returning the hardcoded failure reported success as an error. */
-	return ret;
+	return -LTFS_NO_XATTR;
 }
 
 #define BLOCKLEN_DATA_SIZE 6
@@ -3628,7 +3629,7 @@ static const char *_generate_product_name(const char *product_id)
 
 int iokit_get_device_list(struct tc_drive_info *buf, int count)
 {
-	int i;
+	int i, ret;
 	int found = 0;
 	int32_t devs = iokit_get_ssc_device_count();
 	int drive_type;
@@ -3645,7 +3646,10 @@ int iokit_get_device_list(struct tc_drive_info *buf, int count)
 	if( devs > 0 ) {
 		for (i = 0; i < devs; i++) {
 			if(iokit_find_ssc_device(iokit_device, i) != 0)
+			{
+				ret = -EDEV_DEVICE_UNOPENABLE;
 				continue;
+			}
 			drive_type = iokit_get_drive_identifier(iokit_device, &identifier);
 			if (!drive_type) {
 				if (found < count && buf) {
@@ -3661,7 +3665,7 @@ int iokit_get_device_list(struct tc_drive_info *buf, int count)
 				}
 				found ++;
 			}
-			iokit_free_device(iokit_device);
+			ret = iokit_free_device(iokit_device);
 		}
 	}