diff options
author | Andy Grover <agrover@redhat.com> | 2011-07-19 06:26:37 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-22 05:37:43 -0400 |
commit | 5951146dea1ac8ff2f177477c907084d63913cad (patch) | |
tree | 699cb7c498ca1799ae3e349cb4360171d9fa63e0 /drivers/target/target_core_alua.c | |
parent | f22c119683e73498d8126581a1be75e1b7a339a3 (diff) |
target: More core cleanups from AGrover (round 2)
This patch contains the squashed version of second round of target core
cleanups and simplifications and Andy and Co. It also contains a handful
of fixes to address bugs the original series and other minor cleanups.
Here is the condensed shortlog:
target: Remove unneeded casts to void*
target: Rename get_lun_for_{cmd,tmr} to lookup_{cmd,tmr}_lun
target: Make t_task a member of se_cmd, not a pointer
target: Handle functions returning "-2"
target: Use cmd->se_dev over cmd->se_lun->lun_se_dev
target: Embed qr in struct se_cmd
target: Replace embedded struct se_queue_req with a list_head
target: Rename list_heads that are nodes in struct se_cmd to "*_node"
target: Fold transport_device_setup_cmd() into lookup_{tmr,cmd}_lun()
target: Make t_mem_list and t_mem_list_bidi members of t_task
target: Add comment & cleanup transport_map_sg_to_mem()
target: Remove unneeded checks in transport_free_pages()
(Roland: Fix se_queue_req removal leftovers OOPs)
(nab: Fix transport_lookup_tmr_lun failure case)
(nab: Fix list_empty(&cmd->t_task.t_mem_bidi_list) inversion bugs)
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/target_core_alua.c')
-rw-r--r-- | drivers/target/target_core_alua.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index bfc42adea51..76abd86b6a7 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
@@ -61,11 +61,11 @@ struct t10_alua_lu_gp *default_lu_gp; | |||
61 | */ | 61 | */ |
62 | int core_emulate_report_target_port_groups(struct se_cmd *cmd) | 62 | int core_emulate_report_target_port_groups(struct se_cmd *cmd) |
63 | { | 63 | { |
64 | struct se_subsystem_dev *su_dev = cmd->se_lun->lun_se_dev->se_sub_dev; | 64 | struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev; |
65 | struct se_port *port; | 65 | struct se_port *port; |
66 | struct t10_alua_tg_pt_gp *tg_pt_gp; | 66 | struct t10_alua_tg_pt_gp *tg_pt_gp; |
67 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem; | 67 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem; |
68 | unsigned char *buf = (unsigned char *)cmd->t_task->t_task_buf; | 68 | unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf; |
69 | u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first | 69 | u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first |
70 | Target port group descriptor */ | 70 | Target port group descriptor */ |
71 | 71 | ||
@@ -151,13 +151,13 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd) | |||
151 | */ | 151 | */ |
152 | int core_emulate_set_target_port_groups(struct se_cmd *cmd) | 152 | int core_emulate_set_target_port_groups(struct se_cmd *cmd) |
153 | { | 153 | { |
154 | struct se_device *dev = cmd->se_lun->lun_se_dev; | 154 | struct se_device *dev = cmd->se_dev; |
155 | struct se_subsystem_dev *su_dev = dev->se_sub_dev; | 155 | struct se_subsystem_dev *su_dev = dev->se_sub_dev; |
156 | struct se_port *port, *l_port = cmd->se_lun->lun_sep; | 156 | struct se_port *port, *l_port = cmd->se_lun->lun_sep; |
157 | struct se_node_acl *nacl = cmd->se_sess->se_node_acl; | 157 | struct se_node_acl *nacl = cmd->se_sess->se_node_acl; |
158 | struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp; | 158 | struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp; |
159 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *l_tg_pt_gp_mem; | 159 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *l_tg_pt_gp_mem; |
160 | unsigned char *buf = (unsigned char *)cmd->t_task->t_task_buf; | 160 | unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf; |
161 | unsigned char *ptr = &buf[4]; /* Skip over RESERVED area in header */ | 161 | unsigned char *ptr = &buf[4]; /* Skip over RESERVED area in header */ |
162 | u32 len = 4; /* Skip over RESERVED area in header */ | 162 | u32 len = 4; /* Skip over RESERVED area in header */ |
163 | int alua_access_state, primary = 0, rc; | 163 | int alua_access_state, primary = 0, rc; |