[PATCH] scsi/arcmsr: Add timeout module parameter

[Ari Sundholm]

From: Ari Sundholm asund...@cs.hut.fi

Backported from Areca's current version of the driver.

Signed-off-by: Ari Sundholm asund...@cs.hut.fi
---
 drivers/scsi/arcmsr/arcmsr_hba.c | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 652b41b..e79b62b 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -79,6 +79,9 @@ MODULE_VERSION(ARCMSR_DRIVER_VERSION);
 #defineARCMSR_RETRYCOUNT   12
 
 wait_queue_head_t wait_q;
+static int timeout;
+module_param(timeout, int, 0644);
+MODULE_PARM_DESC(timeout,  scsi cmd timeout value (0 - 120 sec.));
 static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
struct scsi_cmnd *cmd);
 static int arcmsr_iop_confirm(struct AdapterControlBlock *acb);
@@ -1151,6 +1154,14 @@ static int arcmsr_build_ccb(struct AdapterControlBlock 
*acb,
if (pcmd-sc_data_direction == DMA_TO_DEVICE)
arcmsr_cdb-Flags |= ARCMSR_CDB_FLAG_WRITE;
ccb-arc_cdb_size = arccdbsize;
+
+   if (timeout) {
+   pcmd-request-deadline = jiffies + timeout * HZ;
+   if (pcmd-device-request_queue-timeout.function)
+   mod_timer(pcmd-device-request_queue-timeout,
+ pcmd-request-deadline);
+   }
+
return SUCCESS;
 }
 
-- 
1.9.1
--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] scsi: ibmvscsi: ibmvstgt.c: Cleaning up missing null-terminate in conjunction with strncpy

[Rickard Strandqvist]

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: Rickard Strandqvist rickard_strandqv...@spectrumdigital.se
---
 drivers/scsi/ibmvscsi/ibmvstgt.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 56f8a86..5c16d17 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -340,7 +340,7 @@ int send_adapter_info(struct iu_entry *iue,
memset(info, 0, sizeof(*info));
 
strcpy(info-srp_version, 16.a);
-   strncpy(info-partition_name, partition_name,
+   strlcpy(info-partition_name, partition_name,
sizeof(info-partition_name));
info-partition_number = partition_number;
info-mad_version = 1;
@@ -938,7 +938,7 @@ static int get_system_info(void)
 
name = of_get_property(rootdn, ibm,partition-name, NULL);
if (name)
-   strncpy(partition_name, name, sizeof(partition_name));
+   strlcpy(partition_name, name, sizeof(partition_name));
 
num = of_get_property(rootdn, ibm,partition-no, NULL);
if (num)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html