From e167e2ebb7635a4ab792f95808f35255023f443e Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 7 Mar 2019 17:20:01 +0000 Subject: [PATCH 1/4] nightly build: Remove kernel version 2.6.30 and older Or in other words, focus on RHEL 6 (kernel 2.6.32) and later. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8011 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 1927433df..fd89030ce 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -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 From 17ef76b3d1e2a7e494399b5b204f41aac421b134 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 7 Mar 2019 17:54:26 +0000 Subject: [PATCH 2/4] Change (int)ARRAY_SIZE(...) back into ARRAY_SIZE(...) This patch does not change any functionality. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8012 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_user.c | 8 ++++---- scst/src/scst_lib.c | 6 +++--- scst/src/scst_main.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c index b800fb67e..eb6798995 100644 --- a/scst/src/dev_handlers/scst_user.c +++ b/scst/src/dev_handlers/scst_user.c @@ -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; diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index ba4f0c1e9..0220c4c42 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -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; diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c index 39bd1c69b..1abab803c 100644 --- a/scst/src/scst_main.c +++ b/scst/src/scst_main.c @@ -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); From 0351c0ec093a7022aec4e867089e55ccf7ff2a6f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 7 Mar 2019 17:59:10 +0000 Subject: [PATCH 3/4] fcst: Remove ft_cmd_flag() This function is no longer used. r8010 removed the last user of this function. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8013 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/ft_cmd.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c index 31cac8a43..92eb069e3 100644 --- a/fcst/ft_cmd.c +++ b/fcst/ft_cmd.c @@ -20,17 +20,6 @@ #include #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 */ From 450ee268cb39d36a7e4a44ed64f7f63946088470 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 7 Mar 2019 18:11:45 +0000 Subject: [PATCH 4/4] nightly build: Restore a recently removed double quote git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8014 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index fd89030ce..28a42f1e2 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -53,4 +53,4 @@ ABT_KERNELS=" \ 2.6.34.15-nc \ 2.6.33.20-nc \ 2.6.32.70-nc \ -2.6.31.14-nc +2.6.31.14-nc"