Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
  kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
  iscsi-target: Add iSCSI fabric support for target v4.1
  iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
  iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
  iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi

1 files changed, 64 insertions, 0 deletions

diff --git a/drivers/target/iscsi/iscsi_target_stat.h b/drivers/target/iscsi/iscsi_target_stat.h
new file mode 100644
index 000000000000..3ff76b4faad3
--- /dev/null
+++ b/drivers/target/iscsi/iscsi_target_stat.h
@@ -0,0 +1,64 @@
+#ifndef ISCSI_TARGET_STAT_H
+#define ISCSI_TARGET_STAT_H
+
+/*
+ * For struct iscsi_tiqn->tiqn_wwn default groups
+ */
+extern struct config_item_type iscsi_stat_instance_cit;
+extern struct config_item_type iscsi_stat_sess_err_cit;
+extern struct config_item_type iscsi_stat_tgt_attr_cit;
+extern struct config_item_type iscsi_stat_login_cit;
+extern struct config_item_type iscsi_stat_logout_cit;
+
+/*
+ * For struct iscsi_session->se_sess default groups
+ */
+extern struct config_item_type iscsi_stat_sess_cit;
+
+/* iSCSI session error types */
+#define ISCSI_SESS_ERR_UNKNOWN          0
+#define ISCSI_SESS_ERR_DIGEST           1
+#define ISCSI_SESS_ERR_CXN_TIMEOUT      2
+#define ISCSI_SESS_ERR_PDU_FORMAT       3
+
+/* iSCSI session error stats */
+struct iscsi_sess_err_stats {
+        spinlock_t      lock;
+        u32             digest_errors;
+        u32             cxn_timeout_errors;
+        u32             pdu_format_errors;
+        u32             last_sess_failure_type;
+        char            last_sess_fail_rem_name[224];
+} ____cacheline_aligned;
+
+/* iSCSI login failure types (sub oids) */
+#define ISCSI_LOGIN_FAIL_OTHER          2
+#define ISCSI_LOGIN_FAIL_REDIRECT       3
+#define ISCSI_LOGIN_FAIL_AUTHORIZE      4
+#define ISCSI_LOGIN_FAIL_AUTHENTICATE   5
+#define ISCSI_LOGIN_FAIL_NEGOTIATE      6
+
+/* iSCSI login stats */
+struct iscsi_login_stats {
+        spinlock_t      lock;
+        u32             accepts;
+        u32             other_fails;
+        u32             redirects;
+        u32             authorize_fails;
+        u32             authenticate_fails;
+        u32             negotiate_fails;        /* used for notifications */
+        u64             last_fail_time;         /* time stamp (jiffies) */
+        u32             last_fail_type;
+        int             last_intr_fail_ip_family;
+        unsigned char   last_intr_fail_ip_addr[IPV6_ADDRESS_SPACE];
+        char            last_intr_fail_name[224];
+} ____cacheline_aligned;
+
+/* iSCSI logout stats */
+struct iscsi_logout_stats {
+        spinlock_t      lock;
+        u32             normal_logouts;
+        u32             abnormal_logouts;
+} ____cacheline_aligned;
+
+#endif   /*** ISCSI_TARGET_STAT_H ***/