mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 22:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-03-07 18:16:27 -08:00
parent 771a5c193f 450ee268cb
commit 93038095e5
5 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fcst/ft_cmd.c
-11
View File
@@ -20,17 +20,6 @@
#include <scsi/fc_encode.h>
#include "fcst.h"
/*
* Append string to buffer safely.
* Also prepends a space if there's already something the buf.
*/
static void ft_cmd_flag(char *buf, size_t len, const char *desc)
{
if (buf[0])
strlcat(buf, " ", len);
strlcat(buf, desc, len);
}
/*
* ft_set_cmd_state() - set the state of a command
*/
nightly/conf/nightly.conf
+2 -7
View File
@@ -49,13 +49,8 @@ ABT_KERNELS=" \
2.6.38.8-nc \
2.6.37.6-nc \
2.6.36.4-nc \
2.6.35.14 \
2.6.35.14-u-nc \
2.6.35.14-nc \
2.6.34.15-nc \
2.6.33.20-nc \
2.6.32.70-nc \
2.6.31.14-nc \
2.6.30.10-nc \
2.6.29.6-nc \
2.6.27.52-nc \
"
2.6.31.14-nc"
scst/src/dev_handlers/scst_user.c
+4 -4
View File
@@ -2754,7 +2754,7 @@ static int dev_user_unjam_dev(struct scst_user_dev *dev)
spin_lock_irq(&dev->udev_cmd_threads.cmd_list_lock);
repeat:
for (i = 0; i < (int)ARRAY_SIZE(dev->ucmd_hash); i++) {
for (i = 0; i < ARRAY_SIZE(dev->ucmd_hash); i++) {
struct list_head *head = &dev->ucmd_hash[i];
list_for_each_entry(ucmd, head, hash_list_entry) {
@@ -3368,7 +3368,7 @@ static int dev_user_register_dev(struct file *file,
dev->blocking = 0;
} else
dev->blocking = 1;
for (i = 0; i < (int)ARRAY_SIZE(dev->ucmd_hash); i++)
for (i = 0; i < ARRAY_SIZE(dev->ucmd_hash); i++)
INIT_LIST_HEAD(&dev->ucmd_hash[i]);
scst_init_threads(&dev->udev_cmd_threads);
@@ -3923,7 +3923,7 @@ static void dev_user_check_lost_ucmds(struct scst_user_dev *dev)
{
int i;
for (i = 0; i < (int)ARRAY_SIZE(dev->ucmd_hash); i++) {
for (i = 0; i < ARRAY_SIZE(dev->ucmd_hash); i++) {
struct list_head *head = &dev->ucmd_hash[i];
struct scst_user_cmd *ucmd2, *tmp;
@@ -4001,7 +4001,7 @@ static ssize_t dev_user_sysfs_commands_show(struct kobject *kobj,
udev = dev->dh_priv;
spin_lock_irqsave(&udev->udev_cmd_threads.cmd_list_lock, flags);
for (i = 0; i < (int)ARRAY_SIZE(udev->ucmd_hash); i++) {
for (i = 0; i < ARRAY_SIZE(udev->ucmd_hash); i++) {
struct list_head *head = &udev->ucmd_hash[i];
struct scst_user_cmd *ucmd;
scst/src/scst_lib.c
+3 -3
View File
@@ -1669,7 +1669,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
.get_cdb_info = get_cdb_info_len_10}
};
#define SCST_CDB_TBL_SIZE ((int)ARRAY_SIZE(scst_scsi_op_table))
#define SCST_CDB_TBL_SIZE (ARRAY_SIZE(scst_scsi_op_table))
static void scst_del_tgt_dev(struct scst_tgt_dev *tgt_dev);
static void scst_free_tgt_dev(struct scst_tgt_dev *tgt_dev);
@@ -4162,7 +4162,7 @@ static void scst_init_order_data(struct scst_order_data *order_data)
order_data->curr_sn = (typeof(order_data->curr_sn))(-20);
order_data->expected_sn = order_data->curr_sn;
order_data->cur_sn_slot = &order_data->sn_slots[0];
for (i = 0; i < (int)ARRAY_SIZE(order_data->sn_slots); i++)
for (i = 0; i < ARRAY_SIZE(order_data->sn_slots); i++)
atomic_set(&order_data->sn_slots[i], 0);
spin_lock_init(&order_data->init_done_lock);
return;
@@ -15337,7 +15337,7 @@ static void __init scst_scsi_op_list_init(void)
TRACE_ENTRY();
TRACE_DBG("tblsize=%d", SCST_CDB_TBL_SIZE);
TRACE_DBG("tblsize=%zd", SCST_CDB_TBL_SIZE);
for (i = 0; i < 256; i++)
scst_scsi_op_list[i] = SCST_CDB_TBL_SIZE;
scst/src/scst_main.c
+2 -2
View File
@@ -826,7 +826,7 @@ int scst_get_cmd_counter(void)
{
int i, res = 0;
for (i = 0; i < (int)ARRAY_SIZE(scst_percpu_infos); i++)
for (i = 0; i < ARRAY_SIZE(scst_percpu_infos); i++)
res += atomic_read(&scst_percpu_infos[i].cpu_cmd_count);
return res;
}
@@ -2545,7 +2545,7 @@ static int __init init_scst(void)
if (res != 0)
goto out_destroy_sgv_pool;
for (i = 0; i < (int)ARRAY_SIZE(scst_percpu_infos); i++) {
for (i = 0; i < ARRAY_SIZE(scst_percpu_infos); i++) {
atomic_set(&scst_percpu_infos[i].cpu_cmd_count, 0);
spin_lock_init(&scst_percpu_infos[i].tasklet_lock);
INIT_LIST_HEAD(&scst_percpu_infos[i].tasklet_cmd_list);