From c484c03a85993fc6d690d1248e30a1c5bc8d642d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 21 May 2020 16:46:13 +0000 Subject: [PATCH 1/2] fcst: Fix an assignment in ft_recv_cmd(). This was detected by gcc 10 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8947 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/ft_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c index 36eb36450..e14e5346f 100644 --- a/fcst/ft_cmd.c +++ b/fcst/ft_cmd.c @@ -617,7 +617,7 @@ static void ft_recv_cmd(struct ft_sess *sess, struct fc_frame *fp) goto busy; fcmd->scst_cmd = cmd; scst_cmd_set_tgt_priv(cmd, fcmd); - cmd->state = FT_STATE_NEW; + fcmd->state = FT_STATE_NEW; fcmd->seq = sp; #ifdef NEW_LIBFC_API From fd66fe5ea4e61f517728b1e85bcae653bdd74bae Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 21 May 2020 16:48:53 +0000 Subject: [PATCH 2/2] scst, device handlers: Fix gcc 10 compiler warnings Instead of passing an scst_data_direction value to scst_scsi_execute(), pass a dma_data_direction value. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8948 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_cdrom.c | 6 ++---- scst/src/dev_handlers/scst_disk.c | 6 ++---- scst/src/dev_handlers/scst_modisk.c | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c index 18bd4f1bb..04c683c3d 100644 --- a/scst/src/dev_handlers/scst_cdrom.c +++ b/scst/src/dev_handlers/scst_cdrom.c @@ -65,7 +65,6 @@ static int cdrom_attach(struct scst_device *dev) uint8_t *buffer = NULL; int retries; unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE]; - enum dma_data_direction data_dir; TRACE_ENTRY(); @@ -93,11 +92,10 @@ static int cdrom_attach(struct scst_device *dev) while (1) { memset(buffer, 0, buffer_size); memset(sense_buffer, 0, sizeof(sense_buffer)); - data_dir = SCST_DATA_READ; TRACE_DBG("%s", "Doing READ_CAPACITY"); - rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer, - buffer_size, sense_buffer, + rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE, + buffer, buffer_size, sense_buffer, SCST_GENERIC_CDROM_REG_TIMEOUT, 3, 0); TRACE_DBG("READ_CAPACITY done: %x", rc); diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c index 785d4bcf7..fd01b8d1c 100644 --- a/scst/src/dev_handlers/scst_disk.c +++ b/scst/src/dev_handlers/scst_disk.c @@ -50,7 +50,6 @@ static int disk_attach(struct scst_device *dev) uint8_t *buffer = NULL; int retries; unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE]; - enum dma_data_direction data_dir; TRACE_ENTRY(); @@ -78,11 +77,10 @@ static int disk_attach(struct scst_device *dev) while (1) { memset(buffer, 0, buffer_size); memset(sense_buffer, 0, sizeof(sense_buffer)); - data_dir = SCST_DATA_READ; TRACE_DBG("%s", "Doing READ_CAPACITY"); - rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer, - buffer_size, sense_buffer, + rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE, + buffer, buffer_size, sense_buffer, SCST_GENERIC_DISK_REG_TIMEOUT, 3, 0); TRACE_DBG("READ_CAPACITY done: %x", rc); diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c index d892973ae..65699963b 100644 --- a/scst/src/dev_handlers/scst_modisk.c +++ b/scst/src/dev_handlers/scst_modisk.c @@ -130,7 +130,6 @@ static int modisk_attach(struct scst_device *dev) uint8_t *buffer = NULL; int retries; unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE]; - enum dma_data_direction data_dir; TRACE_ENTRY(); @@ -174,11 +173,10 @@ static int modisk_attach(struct scst_device *dev) while (1) { memset(buffer, 0, buffer_size); memset(sense_buffer, 0, sizeof(sense_buffer)); - data_dir = SCST_DATA_READ; TRACE_DBG("%s", "Doing READ_CAPACITY"); - rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer, - buffer_size, sense_buffer, + rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE, + buffer, buffer_size, sense_buffer, SCST_GENERIC_MODISK_REG_TIMEOUT, 3, 0); TRACE_DBG("READ_CAPACITY done: %x", rc);