Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / scsi / scsi_transport.h

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index 658e3ce..cca1d49 100644 (file)
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -20,22 +20,88 @@
 #ifndef SCSI_TRANSPORT_H
 #define SCSI_TRANSPORT_H
 
+#include <linux/transport_class.h>
+#include <scsi/scsi_host.h>
+
 struct scsi_transport_template {
-       /* The NULL terminated list of transport attributes
-        * that should be exported.
-        */
-       struct class_device_attribute **attrs;
+       /* the attribute containers */
+       struct transport_container host_attrs;
+       struct transport_container target_attrs;
+       struct transport_container device_attrs;
 
-       /* The transport class that the device is in */
-       struct class *class;
+       /*
+        * If set, called from sysfs and legacy procfs rescanning code.
+        */
+       int (*user_scan)(struct Scsi_Host *, uint, uint, uint);
 
-       /* Constructor/Destructor functions */
-       int (* setup)(struct scsi_device *);
-       void (* cleanup)(struct scsi_device *);
        /* The size of the specific transport attribute structure (a
         * space of this size will be left at the end of the
-        * scsi_device structure */
-       int     size;
+        * scsi_* structure */
+       int     device_size;
+       int     device_private_offset;
+       int     target_size;
+       int     target_private_offset;
+       int     host_size;
+       /* no private offset for the host; there's an alternative mechanism */
+
+       /*
+        * True if the transport wants to use a host-based work-queue
+        */
+       unsigned int create_work_queue : 1;
+
+       /*
+        * Allows a transport to override the default error handler.
+        */
+       void (* eh_strategy_handler)(struct Scsi_Host *);
+
+       /*
+        * This is an optional routine that allows the transport to become
+        * involved when a scsi io timer fires. The return value tells the
+        * timer routine how to finish the io timeout handling:
+        * EH_HANDLED:          I fixed the error, please complete the command
+        * EH_RESET_TIMER:      I need more time, reset the timer and
+        *                      begin counting again
+        * EH_NOT_HANDLED       Begin normal error recovery
+        */
+       enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
 };
 
+#define transport_class_to_shost(tc) \
+       dev_to_shost((tc)->dev)
+
+
+/* Private area maintenance. The driver requested allocations come
+ * directly after the transport class allocations (if any).  The idea
+ * is that you *must* call these only once.  The code assumes that the
+ * initial values are the ones the transport specific code requires */
+static inline void
+scsi_transport_reserve_target(struct scsi_transport_template * t, int space)
+{
+       BUG_ON(t->target_private_offset != 0);
+       t->target_private_offset = ALIGN(t->target_size, sizeof(void *));
+       t->target_size = t->target_private_offset + space;
+}
+static inline void
+scsi_transport_reserve_device(struct scsi_transport_template * t, int space)
+{
+       BUG_ON(t->device_private_offset != 0);
+       t->device_private_offset = ALIGN(t->device_size, sizeof(void *));
+       t->device_size = t->device_private_offset + space;
+}
+static inline void *
+scsi_transport_target_data(struct scsi_target *starget)
+{
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       return (u8 *)starget->starget_data
+               + shost->transportt->target_private_offset;
+
+}
+static inline void *
+scsi_transport_device_data(struct scsi_device *sdev)
+{
+       struct Scsi_Host *shost = sdev->host;
+       return (u8 *)sdev->sdev_data
+               + shost->transportt->device_private_offset;
+}
+
 #endif /* SCSI_TRANSPORT_H */