- 2.6.17 port work build breaks, but the patch set is relativly stable

[linux-flexiantxendom0-3.2.10.git] / drivers / s390 / scsi / zfcp_def.h

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 2d99108..6eba56c 100644 (file)
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -56,8 +56,6 @@
 #include <asm/qdio.h>
 #include <asm/debug.h>
 #include <asm/ebcdic.h>
-#include <asm/timex.h>
-#include <linux/statistic.h>
 #include <linux/mempool.h>
 #include <linux/syscalls.h>
 #include <linux/ioctl.h>
@@ -66,7 +64,7 @@
 /********************* GENERAL DEFINES *********************************/
 
 /* zfcp version number, it consists of major, minor, and patch-level number */
-#define ZFCP_VERSION           "4.6.0"
+#define ZFCP_VERSION           "4.5.0"
 
 /**
  * zfcp_sg_to_address - determine kernel address from struct scatterlist
@@ -970,12 +968,6 @@ struct zfcp_adapter {
        struct fc_host_statistics *fc_stats;
        struct fsf_qtcb_bottom_port *stats_reset_data;
        unsigned long           stats_reset;
-       struct statistic_interface      *stat_if;
-       struct statistic                *stat_qdio_outb_full;
-       struct statistic                *stat_qdio_outb;
-       struct statistic                *stat_qdio_inb;
-       struct statistic                *stat_low_mem_scsi;
-       struct statistic                *stat_erp;
 };
 
 /*
@@ -1022,24 +1014,6 @@ struct zfcp_unit {
         struct scsi_device     *device;        /* scsi device struct pointer */
        struct zfcp_erp_action erp_action;     /* pending error recovery */
         atomic_t               erp_counter;
-       atomic_t                read_num;
-       atomic_t                write_num;
-       struct statistic_interface      *stat_if;
-       struct statistic                *stat_sizes_scsi_write;
-       struct statistic                *stat_sizes_scsi_read;
-       struct statistic                *stat_sizes_scsi_nodata;
-       struct statistic                *stat_sizes_scsi_nofit;
-       struct statistic                *stat_sizes_scsi_nomem;
-       struct statistic                *stat_sizes_timedout_write;
-       struct statistic                *stat_sizes_timedout_read;
-       struct statistic                *stat_sizes_timedout_nodata;
-       struct statistic                *stat_latencies_scsi_write;
-       struct statistic                *stat_latencies_scsi_read;
-       struct statistic                *stat_latencies_scsi_nodata;
-       struct statistic                *stat_pending_scsi_write;
-       struct statistic                *stat_pending_scsi_read;
-       struct statistic                *stat_erp;
-       struct statistic                *stat_eh_reset;
 };
 
 /* FSF request */
@@ -1060,14 +1034,13 @@ struct zfcp_fsf_req {
        u32                    fsf_command;    /* FSF Command copy */
        struct fsf_qtcb        *qtcb;          /* address of associated QTCB */
        u32                    seq_no;         /* Sequence number of request */
-       unsigned long          data;           /* private data of request */
+        unsigned long          data;           /* private data of request */ 
        struct zfcp_erp_action *erp_action;    /* used if this request is
                                                  issued on behalf of erp */
        mempool_t              *pool;          /* used if request was alloacted
                                                  from emergency pool */
        unsigned long long     issued;         /* request sent time (STCK) */
-       unsigned long long      received;
-       struct zfcp_unit        *unit;
+       struct zfcp_unit       *unit;
 };
 
 typedef void zfcp_fsf_req_handler_t(struct zfcp_fsf_req*);
@@ -1211,29 +1184,4 @@ zfcp_adapter_wait(struct zfcp_adapter *adapter)
        wait_event(adapter->remove_wq, atomic_read(&adapter->refcount) == 0);
 }
 
-
-/*
- *  stuff needed for callback handling
- */
-
-typedef void (*zfcp_cb_incoming_els_t) (struct zfcp_adapter *, void *);
-typedef void (*zfcp_cb_link_down_t) (struct zfcp_adapter *);
-typedef void (*zfcp_cb_link_up_t) (struct zfcp_adapter *);
-typedef void (*zfcp_cb_adapter_add_t) (struct zfcp_adapter *);
-typedef void (*zfcp_cb_port_add_t) (struct zfcp_port *);
-typedef void (*zfcp_cb_unit_add_t) (struct zfcp_unit *);
-
-struct zfcp_callbacks {
-       atomic_t refcount;
-       wait_queue_head_t wq;
-       zfcp_cb_incoming_els_t incoming_els;
-       zfcp_cb_link_down_t link_down;
-       zfcp_cb_link_up_t link_up;
-       zfcp_cb_adapter_add_t adapter_add;
-       zfcp_cb_port_add_t port_add;
-       zfcp_cb_unit_add_t unit_add;
-};
-
-extern struct zfcp_callbacks zfcp_callbacks;
-
 #endif /* ZFCP_DEF_H */