Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2018-02-04 15:58:36 -08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -406,6 +406,6 @@ do { \
__warned = true; \
PRINT_WARNING(format, ## args); \
} \
} while(0)
} while (0)
#endif /* __SCST_DEBUG_H */

View File

@@ -6846,7 +6846,7 @@ static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua)
static int err_inj_cntr;
if (++err_inj_cntr % 256 == 0) {
PRINT_INFO("blockio_exec_rw() error injection");
PRINT_INFO("%s() error injection", __func__);
scst_set_busy(cmd);
goto free_bio;
}

View File

@@ -2027,7 +2027,7 @@ void scst_rx_data(struct scst_cmd *cmd, int status,
break;
default:
PRINT_ERROR("scst_rx_data() received unknown status %x",
PRINT_ERROR("%s() received unknown status %x", __func__,
status);
if (!cmd->write_not_received_set)
scst_cmd_set_write_no_data_received(cmd);