2 files changed, 53 insertions, 0 deletions

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index be117f812deb..d6948d0e8cdb 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -8,6 +8,7 @@
 
 struct request;
 struct scatterlist;
+struct Scsi_Host;
 struct scsi_device;
 
 
@@ -72,6 +73,9 @@ struct scsi_cmnd {
         unsigned short use_sg;  /* Number of pieces of scatter-gather */
         unsigned short sglist_len;      /* size of malloc'd scatter-gather list */
 
+        /* offset in cmd we are at (for multi-transfer tgt cmds) */
+        unsigned offset;
+
         unsigned underflow;     /* Return error if less than
                                    this amount is transferred */
 
@@ -119,7 +123,10 @@ struct scsi_cmnd {
 };
 
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
+extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
+extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *,
+                               struct device *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
 extern void scsi_req_abort_cmd(struct scsi_cmnd *cmd);
@@ -128,4 +135,7 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
                                  size_t *offset, size_t *len);
 extern void scsi_kunmap_atomic_sg(void *virt);
 
+extern struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *, gfp_t);
+extern void scsi_free_sgtable(struct scatterlist *, int);
+
 #endif /* _SCSI_SCSI_CMND_H */
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 6d8945d71c65..7f1f411d07af 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -7,6 +7,7 @@
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 
+struct request_queue;
 struct block_device;
 struct completion;
 struct module;
@@ -124,6 +125,39 @@ struct scsi_host_template {
                              void (*done)(struct scsi_cmnd *));
 
         /*
+         * The transfer functions are used to queue a scsi command to
+         * the LLD. When the driver is finished processing the command
+         * the done callback is invoked.
+         *
+         * return values: see queuecommand
+         *
+         * If the LLD accepts the cmd, it should set the result to an
+         * appropriate value when completed before calling the done function.
+         *
+         * STATUS: REQUIRED FOR TARGET DRIVERS
+         */
+        /* TODO: rename */
+        int (* transfer_response)(struct scsi_cmnd *,
+                                  void (*done)(struct scsi_cmnd *));
+        /*
+         * This is called to inform the LLD to transfer cmd->request_bufflen
+         * bytes of the cmd at cmd->offset in the cmd. The cmd->use_sg
+         * speciefies the number of scatterlist entried in the command
+         * and cmd->request_buffer contains the scatterlist.
+         *
+         * If the command cannot be processed in one transfer_data call
+         * becuase a scatterlist within the LLD's limits cannot be
+         * created then transfer_data will be called multiple times.
+         * It is initially called from process context, and later
+         * calls are from the interrup context.
+         */
+        int (* transfer_data)(struct scsi_cmnd *,
+                              void (*done)(struct scsi_cmnd *));
+
+        /* Used as callback for the completion of task management request. */
+        int (* tsk_mgmt_response)(u64 mid, int result);
+
+        /*
          * This is an error handling strategy routine.  You don't need to
          * define one of these if you don't want to - there is a default
          * routine that is present that should work in most cases.  For those
@@ -589,6 +623,12 @@ struct Scsi_Host {
          */
         unsigned int max_host_blocked;
 
+        /*
+         * q used for scsi_tgt msgs, async events or any other requests that
+         * need to be processed in userspace
+         */
+        struct request_queue *uspace_req_q;
+
         /* legacy crap */
         unsigned long base;
         unsigned long io_port;
@@ -687,6 +727,9 @@ extern void scsi_unblock_requests(struct Scsi_Host *);
 extern void scsi_block_requests(struct Scsi_Host *);
 
 struct class_container;
+
+extern struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
+                                                void (*) (struct request_queue *));
 /*
  * These two functions are used to allocate and free a pseudo device
  * which will connect to the host adapter itself rather than any