2 files changed, 123 insertions, 145 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 053444b027d4..26e13dc7bcdb 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -50,7 +50,6 @@ static const char *verstr = "20050830";
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
 #include <scsi/sg.h>
 
 
@@ -188,8 +187,6 @@ static int from_buffer(struct st_buffer *, char __user *, int);
 static void move_buffer_data(struct st_buffer *, int);
 static void buf_to_sg(struct st_buffer *, unsigned int);
 
-static int st_map_user_pages(struct scatterlist *, const unsigned int, 
-                             unsigned long, size_t, int, unsigned long);
 static int sgl_map_user_pages(struct scatterlist *, const unsigned int, 
                               unsigned long, size_t, int);
 static int sgl_unmap_user_pages(struct scatterlist *, const unsigned int, int);
@@ -313,12 +310,13 @@ static inline char *tape_name(struct scsi_tape *tape)
 }
 
 
-static void st_analyze_sense(struct scsi_request *SRpnt, struct st_cmdstatus *s)
+static void st_analyze_sense(struct st_request *SRpnt, struct st_cmdstatus *s)
 {
         const u8 *ucp;
-        const u8 *sense = SRpnt->sr_sense_buffer;
+        const u8 *sense = SRpnt->sense;
 
-        s->have_sense = scsi_request_normalize_sense(SRpnt, &s->sense_hdr);
+        s->have_sense = scsi_normalize_sense(SRpnt->sense,
+                                SCSI_SENSE_BUFFERSIZE, &s->sense_hdr);
         s->flags = 0;
 
         if (s->have_sense) {
@@ -345,9 +343,9 @@ static void st_analyze_sense(struct scsi_request *SRpnt, struct st_cmdstatus *s)
 
 
 /* Convert the result to success code */
-static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
+static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt)
 {
-        int result = SRpnt->sr_result;
+        int result = SRpnt->result;
         u8 scode;
         DEB(const char *stp;)
         char *name = tape_name(STp);
@@ -366,13 +364,12 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
 
         DEB(
         if (debugging) {
-                printk(ST_DEB_MSG "%s: Error: %x, cmd: %x %x %x %x %x %x Len: %d\n",
+                printk(ST_DEB_MSG "%s: Error: %x, cmd: %x %x %x %x %x %x\n",
                        name, result,
-                       SRpnt->sr_cmnd[0], SRpnt->sr_cmnd[1], SRpnt->sr_cmnd[2],
-                       SRpnt->sr_cmnd[3], SRpnt->sr_cmnd[4], SRpnt->sr_cmnd[5],
-                       SRpnt->sr_bufflen);
+                       SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2],
+                       SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]);
                 if (cmdstatp->have_sense)
-                        scsi_print_req_sense("st", SRpnt);
+                         __scsi_print_sense("st", SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
         } ) /* end DEB */
         if (!debugging) { /* Abnormal conditions for tape */
                 if (!cmdstatp->have_sense)
@@ -386,20 +383,21 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
                          /* scode != UNIT_ATTENTION && */
                          scode != BLANK_CHECK &&
                          scode != VOLUME_OVERFLOW &&
-                         SRpnt->sr_cmnd[0] != MODE_SENSE &&
-                         SRpnt->sr_cmnd[0] != TEST_UNIT_READY) {
+                         SRpnt->cmd[0] != MODE_SENSE &&
+                         SRpnt->cmd[0] != TEST_UNIT_READY) {
                                 printk(KERN_WARNING "%s: Error with sense data: ", name);
-                                scsi_print_req_sense("st", SRpnt);
+                                __scsi_print_sense("st", SRpnt->sense,
+                                                   SCSI_SENSE_BUFFERSIZE);
                 }
         }
 
         if (cmdstatp->fixed_format &&
             STp->cln_mode >= EXTENDED_SENSE_START) {  /* Only fixed format sense */
                 if (STp->cln_sense_value)
-                        STp->cleaning_req |= ((SRpnt->sr_sense_buffer[STp->cln_mode] &
+                        STp->cleaning_req |= ((SRpnt->sense[STp->cln_mode] &
                                                STp->cln_sense_mask) == STp->cln_sense_value);
                 else
-                        STp->cleaning_req |= ((SRpnt->sr_sense_buffer[STp->cln_mode] &
+                        STp->cleaning_req |= ((SRpnt->sense[STp->cln_mode] &
                                                STp->cln_sense_mask) != 0);
         }
         if (cmdstatp->have_sense &&
@@ -411,8 +409,8 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
         if (cmdstatp->have_sense &&
             scode == RECOVERED_ERROR
 #if ST_RECOVERED_WRITE_FATAL
-            && SRpnt->sr_cmnd[0] != WRITE_6
-            && SRpnt->sr_cmnd[0] != WRITE_FILEMARKS
+            && SRpnt->cmd[0] != WRITE_6
+            && SRpnt->cmd[0] != WRITE_FILEMARKS
 #endif
             ) {
                 STp->recover_count++;
@@ -420,9 +418,9 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
 
                 DEB(
                 if (debugging) {
-                        if (SRpnt->sr_cmnd[0] == READ_6)
+                        if (SRpnt->cmd[0] == READ_6)
                                 stp = "read";
-                        else if (SRpnt->sr_cmnd[0] == WRITE_6)
+                        else if (SRpnt->cmd[0] == WRITE_6)
                                 stp = "write";
                         else
                                 stp = "ioctl";
@@ -438,28 +436,37 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
 
 
 /* Wakeup from interrupt */
-static void st_sleep_done(struct scsi_cmnd * SCpnt)
+static void st_sleep_done(void *data, char *sense, int result, int resid)
 {
-        struct scsi_tape *STp = container_of(SCpnt->request->rq_disk->private_data,
-                                             struct scsi_tape, driver);
+        struct st_request *SRpnt = data;
+        struct scsi_tape *STp = SRpnt->stp;
 
-        (STp->buffer)->cmdstat.midlevel_result = SCpnt->result;
-        SCpnt->request->rq_status = RQ_SCSI_DONE;
+        memcpy(SRpnt->sense, sense, SCSI_SENSE_BUFFERSIZE);
+        (STp->buffer)->cmdstat.midlevel_result = SRpnt->result = result;
         DEB( STp->write_pending = 0; )
 
-        if (SCpnt->request->waiting)
-                complete(SCpnt->request->waiting);
+        if (SRpnt->waiting)
+                complete(SRpnt->waiting);
+}
+
+static struct st_request *st_allocate_request(void)
+{
+        return kzalloc(sizeof(struct st_request), GFP_KERNEL);
+}
+
+static void st_release_request(struct st_request *streq)
+{
+        kfree(streq);
 }
 
 /* Do the scsi command. Waits until command performed if do_wait is true.
    Otherwise write_behind_check() is used to check that the command
    has finished. */
-static struct scsi_request *
-st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd,
+static struct st_request *
+st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd,
            int bytes, int direction, int timeout, int retries, int do_wait)
 {
         struct completion *waiting;
-        unsigned char *bp;
 
         /* if async, make sure there's no command outstanding */
         if (!do_wait && ((STp->buffer)->last_SRpnt)) {
@@ -473,7 +480,7 @@ st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *c