[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

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

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index 2dcee7a84752c7089fd9ddfa701efd45589f467b..f6e0bb484c63efb9194c8be4ce90bc7b5da0d482 100644 (file)
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -21,6 +21,7 @@
 #define SCSI_TRANSPORT_H
 
 #include <linux/transport_class.h>
+#include <scsi/scsi_host.h>
 
 struct scsi_transport_template {
        /* the attribute containers */
@@ -28,12 +29,23 @@ struct scsi_transport_template {
        struct transport_container target_attrs;
        struct transport_container device_attrs;
 
+       /*
+        * If set, call target_parent prior to allocating a scsi_target,
+        * so we get the appropriate parent for the target. This function
+        * is required for transports like FC and iSCSI that do not put the
+        * scsi_target under scsi_host.
+        */
+       struct device *(*target_parent)(struct Scsi_Host *, int, uint);
+
        /* The size of the specific transport attribute structure (a
         * space of this size will be left at the end of the
         * 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
@@ -45,4 +57,38 @@ struct scsi_transport_template {
        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 */