diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 32dfc8665..26f7f4cac 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -2686,7 +2686,8 @@ static int fileio_alloc_data_buf(struct scst_cmd *cmd)
 	 * copy.
 	 */
 	if (cmd->tgt_i_data_buf_alloced ||
-	    (cmd->data_direction & SCST_DATA_READ) == 0) {
+	    (cmd->data_direction & SCST_DATA_READ) == 0 ||
+	    (virt_dev->fd && !virt_dev->fd->f_mapping->a_ops->readpage)) {
 		p->use_zero_copy = false;
 	}
 	if (!p->use_zero_copy)
diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index f39472add..4aec3d816 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -1068,22 +1068,8 @@ static int scst_local_queuecommand_lck(struct scsi_cmnd *SCpnt,
 	sgl_count = scsi_sg_count(SCpnt);
 #endif
 
-	dir = SCST_DATA_NONE;
-	switch (SCpnt->sc_data_direction) {
-	case DMA_TO_DEVICE:
-		dir = SCST_DATA_WRITE;
-		scst_cmd_set_expected(scst_cmd, dir, scsi_bufflen(SCpnt));
-		scst_cmd_set_noio_mem_alloc(scst_cmd);
-		scst_cmd_set_tgt_sg(scst_cmd, sgl, sgl_count);
-		break;
-	case DMA_FROM_DEVICE:
-		dir = SCST_DATA_READ;
-		scst_cmd_set_expected(scst_cmd, dir, scsi_bufflen(SCpnt));
-		scst_cmd_set_noio_mem_alloc(scst_cmd);
-		scst_cmd_set_tgt_sg(scst_cmd, sgl, sgl_count);
-		break;
-	case DMA_BIDIRECTIONAL:
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 24))
+	if (scsi_bidi_cmnd(SCpnt)) {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 24)
 		/* Some of these symbols are only defined after 2.6.24 */
 		dir = SCST_DATA_BIDI;
 		scst_cmd_set_expected(scst_cmd, dir, scsi_bufflen(SCpnt));
@@ -1093,13 +1079,20 @@ static int scst_local_queuecommand_lck(struct scsi_cmnd *SCpnt,
 		scst_cmd_set_tgt_sg(scst_cmd, scsi_in(SCpnt)->table.sgl,
 			scsi_in(SCpnt)->table.nents);
 		scst_cmd_set_tgt_out_sg(scst_cmd, sgl, sgl_count);
-		break;
 #endif
-	case DMA_NONE:
-	default:
+	} else if (SCpnt->sc_data_direction == DMA_TO_DEVICE) {
+		dir = SCST_DATA_WRITE;
+		scst_cmd_set_expected(scst_cmd, dir, scsi_bufflen(SCpnt));
+		scst_cmd_set_noio_mem_alloc(scst_cmd);
+		scst_cmd_set_tgt_sg(scst_cmd, sgl, sgl_count);
+	} else if (SCpnt->sc_data_direction == DMA_FROM_DEVICE) {
+		dir = SCST_DATA_READ;
+		scst_cmd_set_expected(scst_cmd, dir, scsi_bufflen(SCpnt));
+		scst_cmd_set_noio_mem_alloc(scst_cmd);
+		scst_cmd_set_tgt_sg(scst_cmd, sgl, sgl_count);
+	} else {
 		dir = SCST_DATA_NONE;
 		scst_cmd_set_expected(scst_cmd, dir, 0);
-		break;
 	}
 
 	/* Save the correct thing below depending on version */