scsi: target: iscsi: Rename iscsi_session to iscsit_session

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

scsi: target: iscsi: Rename iscsi_session to iscsit_session

The structure iscsi_session naming is used by the iSCSI initiator
driver. Rename the target session to iscsit_session to have more readable
code.

Link: https://lore.kernel.org/r/20220428092939.36768-3-mgurtovoy@nvidia.com
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Max Gurtovoy and committed by

Martin K. Petersen 3 years ago 0873fe44 be36d683

+125 -125

23 changed files

expand all collapse all

drivers

target

iscsi

iscsi_target.c

iscsi_target.h

iscsi_target_configfs.c

iscsi_target_device.c

iscsi_target_device.h

iscsi_target_erl0.c

iscsi_target_erl0.h

iscsi_target_erl1.c

iscsi_target_erl1.h

iscsi_target_erl2.c

iscsi_target_erl2.h

iscsi_target_login.c

iscsi_target_nego.c

iscsi_target_nodeattrib.c

iscsi_target_seq_pdu_list.c

iscsi_target_stat.c

iscsi_target_tmr.c

iscsi_target_tpg.c

iscsi_target_tpg.h

iscsi_target_util.c

iscsi_target_util.h

include

target

iscsi

iscsi_target_core.h

iscsi_transport.h

+14 -14

drivers/target/iscsi/iscsi_target.c

reviewed

··· 2350 2350 int iscsit_logout_closesession(struct iscsit_cmd *cmd, struct iscsit_conn *conn) 2351 2351 { 2352 2352 struct iscsit_conn *conn_p; 2353 2353 - struct iscsi_session *sess = conn->sess; 2353 2353 + struct iscsit_session *sess = conn->sess; 2354 2354 2355 2355 pr_debug("Received logout request CLOSESESSION on CID: %hu" 2356 2356 " for SID: %u.\n", conn->cid, conn->sess->sid); ··· 2380 2380 int iscsit_logout_closeconnection(struct iscsit_cmd *cmd, struct iscsit_conn *conn) 2381 2381 { 2382 2382 struct iscsit_conn *l_conn; 2383 2383 - struct iscsi_session *sess = conn->sess; 2383 2383 + struct iscsit_session *sess = conn->sess; 2384 2384 2385 2385 pr_debug("Received logout request CLOSECONNECTION for CID:" 2386 2386 " %hu on CID: %hu.\n", cmd->logout_cid, conn->cid); ··· 2427 2427 2428 2428 int iscsit_logout_removeconnforrecovery(struct iscsit_cmd *cmd, struct iscsit_conn *conn) 2429 2429 { 2430 2430 - struct iscsi_session *sess = conn->sess; 2430 2430 + struct iscsit_session *sess = conn->sess; 2431 2431 2432 2432 pr_debug("Received explicit REMOVECONNFORRECOVERY logout for" 2433 2433 " CID: %hu on CID: %hu.\n", cmd->logout_cid, conn->cid); ··· 2901 2901 { 2902 2902 struct iscsit_conn *logout_conn = NULL; 2903 2903 struct iscsi_conn_recovery *cr = NULL; 2904 2904 - struct iscsi_session *sess = conn->sess; 2904 2904 + struct iscsit_session *sess = conn->sess; 2905 2905 /* 2906 2906 * The actual shutting down of Sessions and/or Connections 2907 2907 * for CLOSESESSION and CLOSECONNECTION Logout Requests ··· 4145 4145 { 4146 4146 LIST_HEAD(tmp_list); 4147 4147 struct iscsit_cmd *cmd = NULL, *cmd_tmp = NULL; 4148 4148 - struct iscsi_session *sess = conn->sess; 4148 4148 + struct iscsit_session *sess = conn->sess; 4149 4149 /* 4150 4150 * We expect this function to only ever be called from either RX or TX 4151 4151 * thread context via iscsit_close_connection() once the other context ··· 4201 4201 struct iscsit_conn *conn) 4202 4202 { 4203 4203 int conn_logout = (conn->conn_state == TARG_CONN_STATE_IN_LOGOUT); 4204 4204 - struct iscsi_session *sess = conn->sess; 4204 4204 + struct iscsit_session *sess = conn->sess; 4205 4205 4206 4206 pr_debug("Closing iSCSI connection CID %hu on SID:" 4207 4207 " %u\n", conn->cid, sess->sid); ··· 4438 4438 * If the iSCSI Session for the iSCSI Initiator Node exists, 4439 4439 * forcefully shutdown the iSCSI NEXUS. 4440 4440 */ 4441 4441 - int iscsit_close_session(struct iscsi_session *sess, bool can_sleep) 4441 4441 + int iscsit_close_session(struct iscsit_session *sess, bool can_sleep) 4442 4442 { 4443 4443 struct iscsi_portal_group *tpg = sess->tpg; 4444 4444 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; ··· 4508 4508 static void iscsit_logout_post_handler_closesession( 4509 4509 struct iscsit_conn *conn) 4510 4510 { 4511 4511 - struct iscsi_session *sess = conn->sess; 4511 4511 + struct iscsit_session *sess = conn->sess; 4512 4512 int sleep = 1; 4513 4513 /* 4514 4514 * Traditional iscsi/tcp will invoke this logic from TX thread ··· 4557 4557 u16 cid) 4558 4558 { 4559 4559 struct iscsit_conn *l_conn; 4560 4560 - struct iscsi_session *sess = conn->sess; 4560 4560 + struct iscsit_session *sess = conn->sess; 4561 4561 bool conn_found = false; 4562 4562 4563 4563 if (!sess) ··· 4649 4649 } 4650 4650 EXPORT_SYMBOL(iscsit_logout_post_handler); 4651 4651 4652 4652 - void iscsit_fail_session(struct iscsi_session *sess) 4652 4652 + void iscsit_fail_session(struct iscsit_session *sess) 4653 4653 { 4654 4654 struct iscsit_conn *conn; 4655 4655 ··· 4665 4665 } 4666 4666 4667 4667 void iscsit_stop_session( 4668 4668 - struct iscsi_session *sess, 4668 4668 + struct iscsit_session *sess, 4669 4669 int session_sleep, 4670 4670 int connection_sleep) 4671 4671 { ··· 4712 4712 4713 4713 int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) 4714 4714 { 4715 4715 - struct iscsi_session *sess; 4715 4715 + struct iscsit_session *sess; 4716 4716 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; 4717 4717 struct se_session *se_sess, *se_sess_tmp; 4718 4718 LIST_HEAD(free_list); ··· 4726 4726 4727 4727 list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list, 4728 4728 sess_list) { 4729 4729 - sess = (struct iscsi_session *)se_sess->fabric_sess_ptr; 4729 4729 + sess = (struct iscsit_session *)se_sess->fabric_sess_ptr; 4730 4730 4731 4731 spin_lock(&sess->conn_lock); 4732 4732 if (atomic_read(&sess->session_fall_back_to_erl0) || ··· 4747 4747 spin_unlock_bh(&se_tpg->session_lock); 4748 4748 4749 4749 list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) { 4750 4750 - sess = (struct iscsi_session *)se_sess->fabric_sess_ptr; 4750 4750 + sess = (struct iscsit_session *)se_sess->fabric_sess_ptr; 4751 4751 4752 4752 list_del_init(&se_sess->sess_list); 4753 4753 iscsit_stop_session(sess, 1, 1);

+4 -4

drivers/target/iscsi/iscsi_target.h

reviewed

··· 9 9 struct iscsit_conn; 10 10 struct iscsi_np; 11 11 struct iscsi_portal_group; 12 12 - struct iscsi_session; 12 12 + struct iscsit_session; 13 13 struct iscsi_tpg_np; 14 14 struct kref; 15 15 struct sockaddr_storage; ··· 41 41 extern int iscsi_target_tx_thread(void *); 42 42 extern int iscsi_target_rx_thread(void *); 43 43 extern int iscsit_close_connection(struct iscsit_conn *); 44 44 - extern int iscsit_close_session(struct iscsi_session *, bool can_sleep); 45 45 - extern void iscsit_fail_session(struct iscsi_session *); 46 46 - extern void iscsit_stop_session(struct iscsi_session *, int, int); 44 44 + extern int iscsit_close_session(struct iscsit_session *, bool can_sleep); 45 45 + extern void iscsit_fail_session(struct iscsit_session *); 46 46 + extern void iscsit_stop_session(struct iscsit_session *, int, int); 47 47 extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int); 48 48 49 49 extern struct iscsit_global *iscsit_global;

+6 -6

drivers/target/iscsi/iscsi_target_configfs.c

reviewed

··· 443 443 char *page) \ 444 444 { \ 445 445 struct se_node_acl *se_nacl = param_to_nacl(item); \ 446 446 - struct iscsi_session *sess; \ 446 446 + struct iscsit_session *sess; \ 447 447 struct se_session *se_sess; \ 448 448 ssize_t rb; \ 449 449 \ ··· 498 498 static ssize_t lio_target_nacl_info_show(struct config_item *item, char *page) 499 499 { 500 500 struct se_node_acl *se_nacl = acl_to_nacl(item); 501 501 - struct iscsi_session *sess; 501 501 + struct iscsit_session *sess; 502 502 struct iscsit_conn *conn; 503 503 struct se_session *se_sess; 504 504 ssize_t rb = 0; ··· 1347 1347 1348 1348 static u32 lio_sess_get_index(struct se_session *se_sess) 1349 1349 { 1350 1350 - struct iscsi_session *sess = se_sess->fabric_sess_ptr; 1350 1350 + struct iscsit_session *sess = se_sess->fabric_sess_ptr; 1351 1351 1352 1352 return sess->session_index; 1353 1353 } ··· 1357 1357 unsigned char *buf, 1358 1358 u32 size) 1359 1359 { 1360 1360 - struct iscsi_session *sess = se_sess->fabric_sess_ptr; 1360 1360 + struct iscsit_session *sess = se_sess->fabric_sess_ptr; 1361 1361 /* 1362 1362 * iSCSI Initiator Session Identifier from RFC-3720. 1363 1363 */ ··· 1468 1468 1469 1469 /* 1470 1470 * This function calls iscsit_inc_session_usage_count() on the 1471 1471 - * struct iscsi_session in question. 1471 1471 + * struct iscsit_session in question. 1472 1472 */ 1473 1473 static void lio_tpg_close_session(struct se_session *se_sess) 1474 1474 { 1475 1475 - struct iscsi_session *sess = se_sess->fabric_sess_ptr; 1475 1475 + struct iscsit_session *sess = se_sess->fabric_sess_ptr; 1476 1476 struct se_portal_group *se_tpg = &sess->tpg->tpg_se_tpg; 1477 1477 1478 1478 spin_lock_bh(&se_tpg->session_lock);

+2 -2

drivers/target/iscsi/iscsi_target_device.c

reviewed

··· 17 17 #include "iscsi_target_tpg.h" 18 18 #include "iscsi_target_util.h" 19 19 20 20 - void iscsit_determine_maxcmdsn(struct iscsi_session *sess) 20 20 + void iscsit_determine_maxcmdsn(struct iscsit_session *sess) 21 21 { 22 22 struct se_node_acl *se_nacl; 23 23 ··· 42 42 atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn); 43 43 } 44 44 45 45 - void iscsit_increment_maxcmdsn(struct iscsit_cmd *cmd, struct iscsi_session *sess) 45 45 + void iscsit_increment_maxcmdsn(struct iscsit_cmd *cmd, struct iscsit_session *sess) 46 46 { 47 47 u32 max_cmd_sn; 48 48

+3 -3

drivers/target/iscsi/iscsi_target_device.h

reviewed

··· 3 3 #define ISCSI_TARGET_DEVICE_H 4 4 5 5 struct iscsit_cmd; 6 6 - struct iscsi_session; 6 6 + struct iscsit_session; 7 7 8 8 - extern void iscsit_determine_maxcmdsn(struct iscsi_session *); 9 9 - extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsi_session *); 8 8 + extern void iscsit_determine_maxcmdsn(struct iscsit_session *); 9 9 + extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsit_session *); 10 10 11 11 #endif /* ISCSI_TARGET_DEVICE_H */

+5 -5

drivers/target/iscsi/iscsi_target_erl0.c

reviewed

··· 743 743 744 744 void iscsit_handle_time2retain_timeout(struct timer_list *t) 745 745 { 746 746 - struct iscsi_session *sess = from_timer(sess, t, time2retain_timer); 746 746 + struct iscsit_session *sess = from_timer(sess, t, time2retain_timer); 747 747 struct iscsi_portal_group *tpg = sess->tpg; 748 748 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; 749 749 ··· 768 768 iscsit_close_session(sess, false); 769 769 } 770 770 771 771 - void iscsit_start_time2retain_handler(struct iscsi_session *sess) 771 771 + void iscsit_start_time2retain_handler(struct iscsit_session *sess) 772 772 { 773 773 int tpg_active; 774 774 /* ··· 794 794 jiffies + sess->sess_ops->DefaultTime2Retain * HZ); 795 795 } 796 796 797 797 - int iscsit_stop_time2retain_timer(struct iscsi_session *sess) 797 797 + int iscsit_stop_time2retain_timer(struct iscsit_session *sess) 798 798 { 799 799 struct iscsi_portal_group *tpg = sess->tpg; 800 800 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; ··· 880 880 } 881 881 EXPORT_SYMBOL(iscsit_cause_connection_reinstatement); 882 882 883 883 - void iscsit_fall_back_to_erl0(struct iscsi_session *sess) 883 883 + void iscsit_fall_back_to_erl0(struct iscsit_session *sess) 884 884 { 885 885 pr_debug("Falling back to ErrorRecoveryLevel=0 for SID:" 886 886 " %u\n", sess->sid); ··· 890 890 891 891 static void iscsit_handle_connection_cleanup(struct iscsit_conn *conn) 892 892 { 893 893 - struct iscsi_session *sess = conn->sess; 893 893 + struct iscsit_session *sess = conn->sess; 894 894 895 895 if ((sess->sess_ops->ErrorRecoveryLevel == 2) && 896 896 !atomic_read(&sess->session_reinstatement) &&

+4 -4

drivers/target/iscsi/iscsi_target_erl0.h

reviewed

··· 6 6 7 7 struct iscsit_cmd; 8 8 struct iscsit_conn; 9 9 - struct iscsi_session; 9 9 + struct iscsit_session; 10 10 11 11 extern void iscsit_set_dataout_sequence_values(struct iscsit_cmd *); 12 12 extern int iscsit_check_pre_dataout(struct iscsit_cmd *, unsigned char *); 13 13 extern int iscsit_check_post_dataout(struct iscsit_cmd *, unsigned char *, u8); 14 14 - extern void iscsit_start_time2retain_handler(struct iscsi_session *); 14 14 + extern void iscsit_start_time2retain_handler(struct iscsit_session *); 15 15 extern void iscsit_handle_time2retain_timeout(struct timer_list *t); 16 16 - extern int iscsit_stop_time2retain_timer(struct iscsi_session *); 16 16 + extern int iscsit_stop_time2retain_timer(struct iscsit_session *); 17 17 extern void iscsit_connection_reinstatement_rcfr(struct iscsit_conn *); 18 18 extern void iscsit_cause_connection_reinstatement(struct iscsit_conn *, int); 19 19 - extern void iscsit_fall_back_to_erl0(struct iscsi_session *); 19 19 + extern void iscsit_fall_back_to_erl0(struct iscsit_session *); 20 20 extern void iscsit_take_action_for_connection_exit(struct iscsit_conn *, bool *); 21 21 22 22 #endif /*** ISCSI_TARGET_ERL0_H ***/

+10 -10

drivers/target/iscsi/iscsi_target_erl1.c

reviewed

··· 767 767 } 768 768 769 769 static int iscsit_attach_ooo_cmdsn( 770 770 - struct iscsi_session *sess, 770 770 + struct iscsit_session *sess, 771 771 struct iscsi_ooo_cmdsn *ooo_cmdsn) 772 772 { 773 773 struct iscsi_ooo_cmdsn *ooo_tail, *ooo_tmp; ··· 815 815 816 816 /* 817 817 * Removes an struct iscsi_ooo_cmdsn from a session's list, 818 818 - * called with struct iscsi_session->cmdsn_mutex held. 818 818 + * called with struct iscsit_session->cmdsn_mutex held. 819 819 */ 820 820 void iscsit_remove_ooo_cmdsn( 821 821 - struct iscsi_session *sess, 821 821 + struct iscsit_session *sess, 822 822 struct iscsi_ooo_cmdsn *ooo_cmdsn) 823 823 { 824 824 list_del(&ooo_cmdsn->ooo_list); ··· 828 828 void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *conn) 829 829 { 830 830 struct iscsi_ooo_cmdsn *ooo_cmdsn; 831 831 - struct iscsi_session *sess = conn->sess; 831 831 + struct iscsit_session *sess = conn->sess; 832 832 833 833 mutex_lock(&sess->cmdsn_mutex); 834 834 list_for_each_entry(ooo_cmdsn, &sess->sess_ooo_cmdsn_list, ooo_list) { ··· 840 840 mutex_unlock(&sess->cmdsn_mutex); 841 841 } 842 842 843 843 - int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess) 843 843 + int iscsit_execute_ooo_cmdsns(struct iscsit_session *sess) 844 844 { 845 845 int ooo_count = 0; 846 846 struct iscsit_cmd *cmd = NULL; ··· 994 994 return 0; 995 995 } 996 996 997 997 - void iscsit_free_all_ooo_cmdsns(struct iscsi_session *sess) 997 997 + void iscsit_free_all_ooo_cmdsns(struct iscsit_session *sess) 998 998 { 999 999 struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp; 1000 1000 ··· 1009 1009 } 1010 1010 1011 1011 int iscsit_handle_ooo_cmdsn( 1012 1012 - struct iscsi_session *sess, 1012 1012 + struct iscsit_session *sess, 1013 1013 struct iscsit_cmd *cmd, 1014 1014 u32 cmdsn) 1015 1015 { ··· 1097 1097 u32 r2t_length = 0, r2t_offset = 0; 1098 1098 struct iscsit_cmd *cmd = from_timer(cmd, t, dataout_timer); 1099 1099 struct iscsit_conn *conn = cmd->conn; 1100 1100 - struct iscsi_session *sess = NULL; 1100 1100 + struct iscsit_session *sess = NULL; 1101 1101 struct iscsi_node_attrib *na; 1102 1102 1103 1103 iscsit_inc_conn_usage_count(conn); ··· 1182 1182 void iscsit_mod_dataout_timer(struct iscsit_cmd *cmd) 1183 1183 { 1184 1184 struct iscsit_conn *conn = cmd->conn; 1185 1185 - struct iscsi_session *sess = conn->sess; 1185 1185 + struct iscsit_session *sess = conn->sess; 1186 1186 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 1187 1187 1188 1188 spin_lock_bh(&cmd->dataout_timeout_lock); ··· 1202 1202 struct iscsit_cmd *cmd, 1203 1203 struct iscsit_conn *conn) 1204 1204 { 1205 1205 - struct iscsi_session *sess = conn->sess; 1205 1205 + struct iscsit_session *sess = conn->sess; 1206 1206 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 1207 1207 1208 1208 lockdep_assert_held(&cmd->dataout_timeout_lock);

+5 -5

drivers/target/iscsi/iscsi_target_erl1.h

reviewed

··· 10 10 struct iscsi_datain_req; 11 11 struct iscsi_ooo_cmdsn; 12 12 struct iscsi_pdu; 13 13 - struct iscsi_session; 13 13 + struct iscsit_session; 14 14 15 15 extern int iscsit_dump_data_payload(struct iscsit_conn *, u32, int); 16 16 extern int iscsit_create_recovery_datain_values_datasequenceinorder_yes( ··· 25 25 extern int iscsit_dataout_datapduinorder_no_fbit(struct iscsit_cmd *, struct iscsi_pdu *); 26 26 extern int iscsit_recover_dataout_sequence(struct iscsit_cmd *, u32, u32); 27 27 extern void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *); 28 28 - extern void iscsit_free_all_ooo_cmdsns(struct iscsi_session *); 29 29 - extern int iscsit_execute_ooo_cmdsns(struct iscsi_session *); 28 28 + extern void iscsit_free_all_ooo_cmdsns(struct iscsit_session *); 29 29 + extern int iscsit_execute_ooo_cmdsns(struct iscsit_session *); 30 30 extern int iscsit_execute_cmd(struct iscsit_cmd *, int); 31 31 - extern int iscsit_handle_ooo_cmdsn(struct iscsi_session *, struct iscsit_cmd *, u32); 32 32 - extern void iscsit_remove_ooo_cmdsn(struct iscsi_session *, struct iscsi_ooo_cmdsn *); 31 31 + extern int iscsit_handle_ooo_cmdsn(struct iscsit_session *, struct iscsit_cmd *, u32); 32 32 + extern void iscsit_remove_ooo_cmdsn(struct iscsit_session *, struct iscsi_ooo_cmdsn *); 33 33 extern void iscsit_handle_dataout_timeout(struct timer_list *t); 34 34 extern void iscsit_mod_dataout_timer(struct iscsit_cmd *); 35 35 extern void iscsit_start_dataout_timer(struct iscsit_cmd *, struct iscsit_conn *);

+9 -9

drivers/target/iscsi/iscsi_target_erl2.c

reviewed

··· 74 74 } 75 75 76 76 static int iscsit_attach_active_connection_recovery_entry( 77 77 - struct iscsi_session *sess, 77 77 + struct iscsit_session *sess, 78 78 struct iscsi_conn_recovery *cr) 79 79 { 80 80 spin_lock(&sess->cr_a_lock); ··· 85 85 } 86 86 87 87 static int iscsit_attach_inactive_connection_recovery_entry( 88 88 - struct iscsi_session *sess, 88 88 + struct iscsit_session *sess, 89 89 struct iscsi_conn_recovery *cr) 90 90 { 91 91 spin_lock(&sess->cr_i_lock); ··· 100 100 } 101 101 102 102 struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( 103 103 - struct iscsi_session *sess, 103 103 + struct iscsit_session *sess, 104 104 u16 cid) 105 105 { 106 106 struct iscsi_conn_recovery *cr; ··· 117 117 return NULL; 118 118 } 119 119 120 120 - void iscsit_free_connection_recovery_entries(struct iscsi_session *sess) 120 120 + void iscsit_free_connection_recovery_entries(struct iscsit_session *sess) 121 121 { 122 122 struct iscsit_cmd *cmd, *cmd_tmp; 123 123 struct iscsi_conn_recovery *cr, *cr_tmp; ··· 169 169 170 170 int iscsit_remove_active_connection_recovery_entry( 171 171 struct iscsi_conn_recovery *cr, 172 172 - struct iscsi_session *sess) 172 172 + struct iscsit_session *sess) 173 173 { 174 174 spin_lock(&sess->cr_a_lock); 175 175 list_del(&cr->cr_list); ··· 186 186 187 187 static void iscsit_remove_inactive_connection_recovery_entry( 188 188 struct iscsi_conn_recovery *cr, 189 189 - struct iscsi_session *sess) 189 189 + struct iscsit_session *sess) 190 190 { 191 191 spin_lock(&sess->cr_i_lock); 192 192 list_del(&cr->cr_list); ··· 198 198 */ 199 199 int iscsit_remove_cmd_from_connection_recovery( 200 200 struct iscsit_cmd *cmd, 201 201 - struct iscsi_session *sess) 201 201 + struct iscsit_session *sess) 202 202 { 203 203 struct iscsi_conn_recovery *cr; 204 204 ··· 219 219 { 220 220 u32 dropped_count = 0; 221 221 struct iscsit_cmd *cmd, *cmd_tmp; 222 222 - struct iscsi_session *sess = cr->sess; 222 222 + struct iscsit_session *sess = cr->sess; 223 223 224 224 spin_lock(&cr->conn_recovery_cmd_lock); 225 225 list_for_each_entry_safe(cmd, cmd_tmp, ··· 268 268 u32 dropped_count = 0; 269 269 struct iscsit_cmd *cmd, *cmd_tmp; 270 270 struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp; 271 271 - struct iscsi_session *sess = conn->sess; 271 271 + struct iscsit_session *sess = conn->sess; 272 272 273 273 mutex_lock(&sess->cmdsn_mutex); 274 274 list_for_each_entry_safe(ooo_cmdsn, ooo_cmdsn_tmp,

+5 -5

drivers/target/iscsi/iscsi_target_erl2.h

reviewed

··· 7 7 struct iscsit_cmd; 8 8 struct iscsit_conn; 9 9 struct iscsi_conn_recovery; 10 10 - struct iscsi_session; 10 10 + struct iscsit_session; 11 11 12 12 extern void iscsit_create_conn_recovery_datain_values(struct iscsit_cmd *, __be32); 13 13 extern void iscsit_create_conn_recovery_dataout_values(struct iscsit_cmd *); 14 14 extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( 15 15 - struct iscsi_session *, u16); 16 16 - extern void iscsit_free_connection_recovery_entries(struct iscsi_session *); 15 15 + struct iscsit_session *, u16); 16 16 + extern void iscsit_free_connection_recovery_entries(struct iscsit_session *); 17 17 extern int iscsit_remove_active_connection_recovery_entry( 18 18 - struct iscsi_conn_recovery *, struct iscsi_session *); 18 18 + struct iscsi_conn_recovery *, struct iscsit_session *); 19 19 extern int iscsit_remove_cmd_from_connection_recovery(struct iscsit_cmd *, 20 20 - struct iscsi_session *); 20 20 + struct iscsit_session *); 21 21 extern void iscsit_discard_cr_cmds_by_expstatsn(struct iscsi_conn_recovery *, u32); 22 22 extern int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsit_conn *); 23 23 extern int iscsit_prepare_cmds_for_reallegiance(struct iscsit_conn *);

+10 -10

drivers/target/iscsi/iscsi_target_login.c

reviewed

··· 133 133 int sessiontype; 134 134 struct iscsi_param *initiatorname_param = NULL, *sessiontype_param = NULL; 135 135 struct iscsi_portal_group *tpg = conn->tpg; 136 136 - struct iscsi_session *sess = NULL, *sess_p = NULL; 136 136 + struct iscsit_session *sess = NULL, *sess_p = NULL; 137 137 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; 138 138 struct se_session *se_sess, *se_sess_tmp; 139 139 ··· 204 204 } 205 205 206 206 static int iscsi_login_set_conn_values( 207 207 - struct iscsi_session *sess, 207 207 + struct iscsit_session *sess, 208 208 struct iscsit_conn *conn, 209 209 __be16 cid) 210 210 { ··· 256 256 struct iscsit_conn *conn, 257 257 unsigned char *buf) 258 258 { 259 259 - struct iscsi_session *sess = NULL; 259 259 + struct iscsit_session *sess = NULL; 260 260 struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf; 261 261 int ret; 262 262 263 263 - sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL); 263 263 + sess = kzalloc(sizeof(struct iscsit_session), GFP_KERNEL); 264 264 if (!sess) { 265 265 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, 266 266 ISCSI_LOGIN_STATUS_NO_RESOURCES); ··· 340 340 struct iscsit_conn *conn) 341 341 { 342 342 struct iscsi_node_attrib *na; 343 343 - struct iscsi_session *sess = conn->sess; 343 343 + struct iscsit_session *sess = conn->sess; 344 344 bool iser = false; 345 345 346 346 sess->tpg = conn->tpg; ··· 474 474 unsigned char *buf) 475 475 { 476 476 struct iscsi_portal_group *tpg = conn->tpg; 477 477 - struct iscsi_session *sess = NULL, *sess_p = NULL; 477 477 + struct iscsit_session *sess = NULL, *sess_p = NULL; 478 478 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; 479 479 struct se_session *se_sess, *se_sess_tmp; 480 480 struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf; ··· 484 484 list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list, 485 485 sess_list) { 486 486 487 487 - sess_p = (struct iscsi_session *)se_sess->fabric_sess_ptr; 487 487 + sess_p = (struct iscsit_session *)se_sess->fabric_sess_ptr; 488 488 if (atomic_read(&sess_p->session_fall_back_to_erl0) || 489 489 atomic_read(&sess_p->session_logout) || 490 490 atomic_read(&sess_p->session_close) || ··· 552 552 { 553 553 struct iscsit_conn *conn_ptr = NULL; 554 554 struct iscsi_conn_recovery *cr = NULL; 555 555 - struct iscsi_session *sess = conn->sess; 555 555 + struct iscsit_session *sess = conn->sess; 556 556 557 557 /* 558 558 * By following item 5 in the login table, if we have found ··· 614 614 615 615 static void iscsi_post_login_start_timers(struct iscsit_conn *conn) 616 616 { 617 617 - struct iscsi_session *sess = conn->sess; 617 617 + struct iscsit_session *sess = conn->sess; 618 618 /* 619 619 * FIXME: Unsolicited NopIN support for ISER 620 620 */ ··· 677 677 u8 zero_tsih) 678 678 { 679 679 int stop_timer = 0; 680 680 - struct iscsi_session *sess = conn->sess; 680 680 + struct iscsit_session *sess = conn->sess; 681 681 struct se_session *se_sess = sess->se_sess; 682 682 struct iscsi_portal_group *tpg = sess->tpg; 683 683 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;

+3 -3

drivers/target/iscsi/iscsi_target_nego.c

reviewed

··· 102 102 int *out_length, 103 103 unsigned char *authtype) 104 104 { 105 105 - struct iscsi_session *sess = conn->sess; 105 105 + struct iscsit_session *sess = conn->sess; 106 106 struct iscsi_node_auth *auth; 107 107 struct iscsi_node_acl *iscsi_nacl; 108 108 struct iscsi_portal_group *iscsi_tpg; ··· 1059 1059 { 1060 1060 char *i_buf = NULL, *s_buf = NULL, *t_buf = NULL; 1061 1061 char *tmpbuf, *start = NULL, *end = NULL, *key, *value; 1062 1062 - struct iscsi_session *sess = conn->sess; 1062 1062 + struct iscsit_session *sess = conn->sess; 1063 1063 struct iscsi_tiqn *tiqn; 1064 1064 struct iscsi_tpg_np *tpg_np = NULL; 1065 1065 struct iscsi_login_req *login_req; ··· 1232 1232 1233 1233 /* 1234 1234 * conn->sess->node_acl will be set when the referenced 1235 1235 - * struct iscsi_session is located from received ISID+TSIH in 1235 1235 + * struct iscsit_session is located from received ISID+TSIH in 1236 1236 * iscsi_login_non_zero_tsih_s2(). 1237 1237 */ 1238 1238 if (!login->leading_connection) {

+1 -1

drivers/target/iscsi/iscsi_target_nodeattrib.c

reviewed

··· 96 96 u32 nopin_timeout) 97 97 { 98 98 struct iscsi_node_attrib *a = &acl->node_attrib; 99 99 - struct iscsi_session *sess; 99 99 + struct iscsit_session *sess; 100 100 struct iscsit_conn *conn; 101 101 struct se_node_acl *se_nacl = &a->nacl->se_node_acl; 102 102 struct se_session *se_sess;

+1 -1

drivers/target/iscsi/iscsi_target_seq_pdu_list.c

reviewed

··· 493 493 struct iscsi_pdu *pdu = NULL; 494 494 struct iscsi_seq *seq = NULL; 495 495 496 496 - struct iscsi_session *sess = conn->sess; 496 496 + struct iscsit_session *sess = conn->sess; 497 497 struct iscsi_node_attrib *na; 498 498 499 499 /*

+8 -8

drivers/target/iscsi/iscsi_target_stat.c

reviewed

··· 599 599 { 600 600 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 601 601 struct se_node_acl *se_nacl = &acl->se_node_acl; 602 602 - struct iscsi_session *sess; 602 602 + struct iscsit_session *sess; 603 603 struct se_session *se_sess; 604 604 ssize_t ret = 0; 605 605 ··· 620 620 { 621 621 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 622 622 struct se_node_acl *se_nacl = &acl->se_node_acl; 623 623 - struct iscsi_session *sess; 623 623 + struct iscsit_session *sess; 624 624 struct se_session *se_sess; 625 625 ssize_t ret = 0; 626 626 ··· 642 642 { 643 643 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 644 644 struct se_node_acl *se_nacl = &acl->se_node_acl; 645 645 - struct iscsi_session *sess; 645 645 + struct iscsit_session *sess; 646 646 struct se_session *se_sess; 647 647 ssize_t ret = 0; 648 648 ··· 664 664 { 665 665 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 666 666 struct se_node_acl *se_nacl = &acl->se_node_acl; 667 667 - struct iscsi_session *sess; 667 667 + struct iscsit_session *sess; 668 668 struct se_session *se_sess; 669 669 ssize_t ret = 0; 670 670 ··· 686 686 { 687 687 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 688 688 struct se_node_acl *se_nacl = &acl->se_node_acl; 689 689 - struct iscsi_session *sess; 689 689 + struct iscsit_session *sess; 690 690 struct se_session *se_sess; 691 691 ssize_t ret = 0; 692 692 ··· 708 708 { 709 709 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 710 710 struct se_node_acl *se_nacl = &acl->se_node_acl; 711 711 - struct iscsi_session *sess; 711 711 + struct iscsit_session *sess; 712 712 struct se_session *se_sess; 713 713 ssize_t ret = 0; 714 714 ··· 730 730 { 731 731 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 732 732 struct se_node_acl *se_nacl = &acl->se_node_acl; 733 733 - struct iscsi_session *sess; 733 733 + struct iscsit_session *sess; 734 734 struct se_session *se_sess; 735 735 ssize_t ret = 0; 736 736 ··· 752 752 { 753 753 struct iscsi_node_acl *acl = iscsi_stat_nacl(item); 754 754 struct se_node_acl *se_nacl = &acl->se_node_acl; 755 755 - struct iscsi_session *sess; 755 755 + struct iscsit_session *sess; 756 756 struct se_session *se_sess; 757 757 ssize_t ret = 0; 758 758

+3 -3

drivers/target/iscsi/iscsi_target_tmr.c

reviewed

··· 67 67 struct iscsi_tmr_req *tmr_req, 68 68 unsigned char *buf) 69 69 { 70 70 - struct iscsi_session *sess = conn->sess; 70 70 + struct iscsit_session *sess = conn->sess; 71 71 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 72 72 73 73 if (!na->tmr_warm_reset) { ··· 87 87 struct iscsi_tmr_req *tmr_req, 88 88 unsigned char *buf) 89 89 { 90 90 - struct iscsi_session *sess = conn->sess; 90 90 + struct iscsit_session *sess = conn->sess; 91 91 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 92 92 93 93 if (!na->tmr_cold_reset) { ··· 177 177 static void iscsit_task_reassign_remove_cmd( 178 178 struct iscsit_cmd *cmd, 179 179 struct iscsi_conn_recovery *cr, 180 180 - struct iscsi_session *sess) 180 180 + struct iscsit_session *sess) 181 181 { 182 182 int ret; 183 183

+1 -1

drivers/target/iscsi/iscsi_target_tpg.c

reviewed

··· 390 390 } 391 391 392 392 struct iscsi_node_attrib *iscsit_tpg_get_node_attrib( 393 393 - struct iscsi_session *sess) 393 393 + struct iscsit_session *sess) 394 394 { 395 395 struct se_session *se_sess = sess->se_sess; 396 396 struct se_node_acl *se_nacl = se_sess->se_node_acl;

+2 -2

drivers/target/iscsi/iscsi_target_tpg.h

reviewed

··· 5 5 #include <linux/types.h> 6 6 7 7 struct iscsi_np; 8 8 - struct iscsi_session; 8 8 + struct iscsit_session; 9 9 struct iscsi_tiqn; 10 10 struct iscsi_tpg_np; 11 11 struct se_node_acl; ··· 28 28 struct iscsi_portal_group *, const char *, u32); 29 29 extern void iscsit_tpg_del_initiator_node_acl(struct iscsi_portal_group *, 30 30 struct se_node_acl *); 31 31 - extern struct iscsi_node_attrib *iscsit_tpg_get_node_attrib(struct iscsi_session *); 31 31 + extern struct iscsi_node_attrib *iscsit_tpg_get_node_attrib(struct iscsit_session *); 32 32 extern void iscsit_tpg_del_external_nps(struct iscsi_tpg_np *); 33 33 extern struct iscsi_tpg_np *iscsit_tpg_locate_child_np(struct iscsi_tpg_np *, int); 34 34 extern struct iscsi_tpg_np *iscsit_tpg_add_network_portal(struct iscsi_portal_group *,

+14 -14

drivers/target/iscsi/iscsi_target_util.c

reviewed

··· 238 238 return NULL; 239 239 } 240 240 241 241 - static inline int iscsit_check_received_cmdsn(struct iscsi_session *sess, u32 cmdsn) 241 241 + static inline int iscsit_check_received_cmdsn(struct iscsit_session *sess, u32 cmdsn) 242 242 { 243 243 u32 max_cmdsn; 244 244 int ret; ··· 446 446 } 447 447 448 448 int iscsit_find_cmd_for_recovery( 449 449 - struct iscsi_session *sess, 449 449 + struct iscsit_session *sess, 450 450 struct iscsit_cmd **cmd_ptr, 451 451 struct iscsi_conn_recovery **cr_ptr, 452 452 itt_t init_task_tag) ··· 696 696 697 697 void iscsit_release_cmd(struct iscsit_cmd *cmd) 698 698 { 699 699 - struct iscsi_session *sess; 699 699 + struct iscsit_session *sess; 700 700 struct se_cmd *se_cmd = &cmd->se_cmd; 701 701 702 702 WARN_ON(!list_empty(&cmd->i_conn_node)); ··· 762 762 } 763 763 EXPORT_SYMBOL(iscsit_free_cmd); 764 764 765 765 - bool iscsit_check_session_usage_count(struct iscsi_session *sess, 765 765 + bool iscsit_check_session_usage_count(struct iscsit_session *sess, 766 766 bool can_sleep) 767 767 { 768 768 spin_lock_bh(&sess->session_usage_lock); ··· 780 780 return false; 781 781 } 782 782 783 783 - void iscsit_dec_session_usage_count(struct iscsi_session *sess) 783 783 + void iscsit_dec_session_usage_count(struct iscsit_session *sess) 784 784 { 785 785 spin_lock_bh(&sess->session_usage_lock); 786 786 sess->session_usage_count--; ··· 791 791 spin_unlock_bh(&sess->session_usage_lock); 792 792 } 793 793 794 794 - void iscsit_inc_session_usage_count(struct iscsi_session *sess) 794 794 + void iscsit_inc_session_usage_count(struct iscsit_session *sess) 795 795 { 796 796 spin_lock_bh(&sess->session_usage_lock); 797 797 sess->session_usage_count++; 798 798 spin_unlock_bh(&sess->session_usage_lock); 799 799 } 800 800 801 801 - struct iscsit_conn *iscsit_get_conn_from_cid(struct iscsi_session *sess, u16 cid) 801 801 + struct iscsit_conn *iscsit_get_conn_from_cid(struct iscsit_session *sess, u16 cid) 802 802 { 803 803 struct iscsit_conn *conn; 804 804 ··· 816 816 return NULL; 817 817 } 818 818 819 819 - struct iscsit_conn *iscsit_get_conn_from_cid_rcfr(struct iscsi_session *sess, u16 cid) 819 819 + struct iscsit_conn *iscsit_get_conn_from_cid_rcfr(struct iscsit_session *sess, u16 cid) 820 820 { 821 821 struct iscsit_conn *conn; 822 822 ··· 896 896 void iscsit_handle_nopin_response_timeout(struct timer_list *t) 897 897 { 898 898 struct iscsit_conn *conn = from_timer(conn, t, nopin_response_timer); 899 899 - struct iscsi_session *sess = conn->sess; 899 899 + struct iscsit_session *sess = conn->sess; 900 900 901 901 iscsit_inc_conn_usage_count(conn); 902 902 ··· 921 921 922 922 void iscsit_mod_nopin_response_timer(struct iscsit_conn *conn) 923 923 { 924 924 - struct iscsi_session *sess = conn->sess; 924 924 + struct iscsit_session *sess = conn->sess; 925 925 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 926 926 927 927 spin_lock_bh(&conn->nopin_timer_lock); ··· 937 937 938 938 void iscsit_start_nopin_response_timer(struct iscsit_conn *conn) 939 939 { 940 940 - struct iscsi_session *sess = conn->sess; 940 940 + struct iscsit_session *sess = conn->sess; 941 941 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 942 942 943 943 spin_lock_bh(&conn->nopin_timer_lock); ··· 994 994 995 995 void __iscsit_start_nopin_timer(struct iscsit_conn *conn) 996 996 { 997 997 - struct iscsi_session *sess = conn->sess; 997 997 + struct iscsit_session *sess = conn->sess; 998 998 struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess); 999 999 1000 1000 lockdep_assert_held(&conn->nopin_timer_lock); ··· 1198 1198 return conn->conn_transport->iscsit_put_login_tx(conn, login, 0); 1199 1199 } 1200 1200 1201 1201 - void iscsit_print_session_params(struct iscsi_session *sess) 1201 1201 + void iscsit_print_session_params(struct iscsit_session *sess) 1202 1202 { 1203 1203 struct iscsit_conn *conn; 1204 1204 ··· 1351 1351 return tpg->tpg_tiqn; 1352 1352 } 1353 1353 1354 1354 - void iscsit_fill_cxn_timeout_err_stats(struct iscsi_session *sess) 1354 1354 + void iscsit_fill_cxn_timeout_err_stats(struct iscsit_session *sess) 1355 1355 { 1356 1356 struct iscsi_portal_group *tpg = sess->tpg; 1357 1357 struct iscsi_tiqn *tiqn = tpg->tpg_tiqn;

+9 -9

drivers/target/iscsi/iscsi_target_util.h

reviewed

··· 10 10 struct iscsit_cmd; 11 11 struct iscsit_conn; 12 12 struct iscsi_conn_recovery; 13 13 - struct iscsi_session; 13 13 + struct iscsit_session; 14 14 15 15 extern int iscsit_add_r2t_to_list(struct iscsit_cmd *, u32, u32, int, u32); 16 16 extern struct iscsi_r2t *iscsit_get_r2t_for_eos(struct iscsit_cmd *, u32, u32); ··· 28 28 extern struct iscsit_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsit_conn *, 29 29 itt_t, u32); 30 30 extern struct iscsit_cmd *iscsit_find_cmd_from_ttt(struct iscsit_conn *, u32); 31 31 - extern int iscsit_find_cmd_for_recovery(struct iscsi_session *, struct iscsit_cmd **, 31 31 + extern int iscsit_find_cmd_for_recovery(struct iscsit_session *, struct iscsit_cmd **, 32 32 struct iscsi_conn_recovery **, itt_t); 33 33 extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd *, struct iscsit_conn *, u8); 34 34 extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsit_conn *); ··· 40 40 extern void iscsit_release_cmd(struct iscsit_cmd *); 41 41 extern void __iscsit_free_cmd(struct iscsit_cmd *, bool); 42 42 extern void iscsit_free_cmd(struct iscsit_cmd *, bool); 43 43 - extern bool iscsit_check_session_usage_count(struct iscsi_session *sess, bool can_sleep); 44 44 - extern void iscsit_dec_session_usage_count(struct iscsi_session *); 45 45 - extern void iscsit_inc_session_usage_count(struct iscsi_session *); 46 46 - extern struct iscsit_conn *iscsit_get_conn_from_cid(struct iscsi_session *, u16); 47 47 - extern struct iscsit_conn *iscsit_get_conn_from_cid_rcfr(struct iscsi_session *, u16); 43 43 + extern bool iscsit_check_session_usage_count(struct iscsit_session *sess, bool can_sleep); 44 44 + extern void iscsit_dec_session_usage_count(struct iscsit_session *); 45 45 + extern void iscsit_inc_session_usage_count(struct iscsit_session *); 46 46 + extern struct iscsit_conn *iscsit_get_conn_from_cid(struct iscsit_session *, u16); 47 47 + extern struct iscsit_conn *iscsit_get_conn_from_cid_rcfr(struct iscsit_session *, u16); 48 48 extern void iscsit_check_conn_usage_count(struct iscsit_conn *); 49 49 extern void iscsit_dec_conn_usage_count(struct iscsit_conn *); 50 50 extern void iscsit_inc_conn_usage_count(struct iscsit_conn *); ··· 59 59 extern int iscsit_send_tx_data(struct iscsit_cmd *, struct iscsit_conn *, int); 60 60 extern int iscsit_fe_sendpage_sg(struct iscsit_cmd *, struct iscsit_conn *); 61 61 extern int iscsit_tx_login_rsp(struct iscsit_conn *, u8, u8); 62 62 - extern void iscsit_print_session_params(struct iscsi_session *); 62 62 + extern void iscsit_print_session_params(struct iscsit_session *); 63 63 extern int iscsit_print_dev_to_proc(char *, char **, off_t, int); 64 64 extern int iscsit_print_sessions_to_proc(char *, char **, off_t, int); 65 65 extern int iscsit_print_tpg_to_proc(char *, char **, off_t, int); ··· 67 67 extern int tx_data(struct iscsit_conn *, struct kvec *, int, int); 68 68 extern void iscsit_collect_login_stats(struct iscsit_conn *, u8, u8); 69 69 extern struct iscsi_tiqn *iscsit_snmp_get_tiqn(struct iscsit_conn *); 70 70 - extern void iscsit_fill_cxn_timeout_err_stats(struct iscsi_session *); 70 70 + extern void iscsit_fill_cxn_timeout_err_stats(struct iscsit_session *); 71 71 72 72 #endif /*** ISCSI_TARGET_UTIL_H ***/

+5 -5

include/target/iscsi/iscsi_target_core.h

reviewed

··· 482 482 /* Pointer to connection recovery entry */ 483 483 struct iscsi_conn_recovery *cr; 484 484 /* Session the command is part of, used for connection recovery */ 485 485 - struct iscsi_session *sess; 485 485 + struct iscsit_session *sess; 486 486 /* list_head for connection list */ 487 487 struct list_head i_conn_node; 488 488 /* The TCM I/O descriptor that is accessed via container_of() */ ··· 598 598 struct iscsi_portal_group *tpg; 599 599 struct iscsi_tpg_np *tpg_np; 600 600 /* Pointer to parent session */ 601 601 - struct iscsi_session *sess; 601 601 + struct iscsit_session *sess; 602 602 int bitmap_id; 603 603 int rx_thread_active; 604 604 struct task_struct *rx_thread; ··· 618 618 struct list_head conn_recovery_cmd_list; 619 619 spinlock_t conn_recovery_cmd_lock; 620 620 struct timer_list time2retain_timer; 621 621 - struct iscsi_session *sess; 621 621 + struct iscsit_session *sess; 622 622 struct list_head cr_list; 623 623 } ____cacheline_aligned; 624 624 625 625 - struct iscsi_session { 625 625 + struct iscsit_session { 626 626 u8 initiator_vendor; 627 627 u8 isid[6]; 628 628 enum iscsi_timer_flags_table time2retain_timer_flags; ··· 885 885 struct iscsi_portal_group *discovery_tpg; 886 886 }; 887 887 888 888 - static inline u32 session_get_next_ttt(struct iscsi_session *session) 888 888 + static inline u32 session_get_next_ttt(struct iscsit_session *session) 889 889 { 890 890 u32 ttt; 891 891

+1 -1

include/target/iscsi/iscsi_transport.h

reviewed

··· 105 105 /* 106 106 * From iscsi_target_device.c 107 107 */ 108 108 - extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsi_session *); 108 108 + extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsit_session *); 109 109 /* 110 110 * From iscsi_target_erl0.c 111 111 */