hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/include/target/iscsi/iscsi_target_core.h
....@@ -25,6 +25,7 @@
2525 #define ISCSIT_TCP_BACKLOG 256
2626 #define ISCSI_RX_THREAD_NAME "iscsi_trx"
2727 #define ISCSI_TX_THREAD_NAME "iscsi_ttx"
28
+#define ISCSI_IQN_LEN 224
2829
2930 /* struct iscsi_node_attrib sanity values */
3031 #define NA_DATAOUT_TIMEOUT 3
....@@ -270,9 +271,9 @@
270271 };
271272
272273 struct iscsi_sess_ops {
273
- char InitiatorName[224];
274
+ char InitiatorName[ISCSI_IQN_LEN];
274275 char InitiatorAlias[256];
275
- char TargetName[224];
276
+ char TargetName[ISCSI_IQN_LEN];
276277 char TargetAlias[256];
277278 char TargetAddress[256];
278279 u16 TargetPortalGroupTag; /* [0..65535] */
....@@ -298,16 +299,6 @@
298299 int state;
299300 struct iscsi_cmd *cmd;
300301 struct list_head qr_list;
301
-};
302
-
303
-struct iscsi_data_count {
304
- int data_length;
305
- int sync_and_steering;
306
- enum data_count_type type;
307
- u32 iov_count;
308
- u32 ss_iov_count;
309
- u32 ss_marker_count;
310
- struct kvec *iov;
311302 };
312303
313304 struct iscsi_param_list {
....@@ -472,6 +463,7 @@
472463 struct timer_list dataout_timer;
473464 /* Iovecs for SCSI data payload RX/TX w/ kernel level sockets */
474465 struct kvec *iov_data;
466
+ void *overflow_buf;
475467 /* Iovecs for miscellaneous purposes */
476468 #define ISCSI_MISC_IOVECS 5
477469 struct kvec iov_misc[ISCSI_MISC_IOVECS];
....@@ -564,10 +556,11 @@
564556 struct socket *sock;
565557 void (*orig_data_ready)(struct sock *);
566558 void (*orig_state_change)(struct sock *);
567
-#define LOGIN_FLAGS_READ_ACTIVE 1
568
-#define LOGIN_FLAGS_CLOSED 2
569
-#define LOGIN_FLAGS_READY 4
570
-#define LOGIN_FLAGS_INITIAL_PDU 8
559
+#define LOGIN_FLAGS_READY 0
560
+#define LOGIN_FLAGS_INITIAL_PDU 1
561
+#define LOGIN_FLAGS_READ_ACTIVE 2
562
+#define LOGIN_FLAGS_WRITE_ACTIVE 3
563
+#define LOGIN_FLAGS_CLOSED 4
571564 unsigned long login_flags;
572565 struct delayed_work login_work;
573566 struct iscsi_login *login;
....@@ -855,7 +848,6 @@
855848 };
856849
857850 struct iscsi_tiqn {
858
-#define ISCSI_IQN_LEN 224
859851 unsigned char tiqn[ISCSI_IQN_LEN];
860852 enum tiqn_state_table tiqn_state;
861853 int tiqn_access_count;