lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

target: Use LIST_HEAD()/DEFINE_MUTEX() for static objects

Browse Source 
Instead of

   static struct list_head foo;
   static struct mutex bar;

   ...

   INIT_LIST_HEAD(&foo);
   mutex_init(&bar);

just do

   static LIST_HEAD(foo);
   static DEFINE_MUTEX(bar);

Also remove some superfluous struct list_head and spinlock_t
initialization calls where the variables are already defined using
macros that initialize them.

This saves a decent amount of compiled code too:

    add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-178 (-178)
    function                                     old     new   delta
    target_core_init_configfs                    898     850     -48
    core_scsi3_emulate_pro_preempt              1742    1683     -59
    iscsi_thread_set_init                        159      88     -71

Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Roland Dreier
2012-01-12 10:41:18 -08:00
committed by Nicholas Bellinger
parent d5b4a21b3d
commit d0f474e501
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/target/iscsi/iscsi_target_tq.c
View File

@@ -536,12 +536,6 @@ int iscsi_thread_set_init(void)
return -ENOMEM; return -ENOMEM;
} }
spin_lock_init(&active_ts_lock);
spin_lock_init(&inactive_ts_lock);
spin_lock_init(&ts_bitmap_lock);
INIT_LIST_HEAD(&active_ts_list);
INIT_LIST_HEAD(&inactive_ts_list);
return 0; return 0;
} }

6
drivers/target/target_core_configfs.c
View File

@@ -52,8 +52,8 @@
extern struct t10_alua_lu_gp *default_lu_gp; extern struct t10_alua_lu_gp *default_lu_gp;
static struct list_head g_tf_list; static LIST_HEAD(g_tf_list);
static struct mutex g_tf_lock; static DEFINE_MUTEX(g_tf_lock);
struct target_core_configfs_attribute { struct target_core_configfs_attribute {
struct configfs_attribute attr; struct configfs_attribute attr;
@@ -3117,8 +3117,6 @@ static int __init target_core_init_configfs(void)
config_group_init(&subsys->su_group); config_group_init(&subsys->su_group);
mutex_init(&subsys->su_mutex); mutex_init(&subsys->su_mutex);
INIT_LIST_HEAD(&g_tf_list);
mutex_init(&g_tf_lock);
ret = init_se_kmem_caches(); ret = init_se_kmem_caches();
if (ret < 0) if (ret < 0)
return ret; return ret;

6
drivers/target/target_core_pr.c
View File

@@ -1487,7 +1487,7 @@ static int core_scsi3_decode_spec_i_port(
struct se_dev_entry *dest_se_deve = NULL, *local_se_deve; struct se_dev_entry *dest_se_deve = NULL, *local_se_deve;
struct t10_pr_registration *dest_pr_reg, *local_pr_reg, *pr_reg_e; struct t10_pr_registration *dest_pr_reg, *local_pr_reg, *pr_reg_e;
struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe;
struct list_head tid_dest_list; LIST_HEAD(tid_dest_list);
struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp; struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp;
struct target_core_fabric_ops *tmp_tf_ops; struct target_core_fabric_ops *tmp_tf_ops;
unsigned char *buf; unsigned char *buf;
@@ -1498,7 +1498,6 @@ static int core_scsi3_decode_spec_i_port(
u32 dest_rtpi = 0; u32 dest_rtpi = 0;
memset(dest_iport, 0, 64); memset(dest_iport, 0, 64);
INIT_LIST_HEAD(&tid_dest_list);
local_se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun]; local_se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
/* /*
@@ -2994,7 +2993,7 @@ static int core_scsi3_pro_preempt(
struct se_dev_entry *se_deve; struct se_dev_entry *se_deve;
struct se_node_acl *pr_reg_nacl; struct se_node_acl *pr_reg_nacl;
struct se_session *se_sess = cmd->se_sess; struct se_session *se_sess = cmd->se_sess;
struct list_head preempt_and_abort_list; LIST_HEAD(preempt_and_abort_list);
struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_reg_n, *pr_res_holder; struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_reg_n, *pr_res_holder;
struct t10_reservation *pr_tmpl = &dev->se_sub_dev->t10_pr; struct t10_reservation *pr_tmpl = &dev->se_sub_dev->t10_pr;
u32 pr_res_mapped_lun = 0; u32 pr_res_mapped_lun = 0;
@@ -3027,7 +3026,6 @@ static int core_scsi3_pro_preempt(
cmd->scsi_sense_reason = TCM_INVALID_PARAMETER_LIST; cmd->scsi_sense_reason = TCM_INVALID_PARAMETER_LIST;
return -EINVAL; return -EINVAL;
} }
INIT_LIST_HEAD(&preempt_and_abort_list);
spin_lock(&dev->dev_reservation_lock); spin_lock(&dev->dev_reservation_lock);
pr_res_holder = dev->dev_pr_res_holder; pr_res_holder = dev->dev_pr_res_holder;