[SCSI] scsi_error: send the sense buffer down without copying
authorJames Bottomley <James.Bottomley@steeleye.com>
Tue, 22 May 2007 19:43:14 +0000 (14:43 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Thu, 24 May 2007 14:10:02 +0000 (09:10 -0500)
Now that the block submission path correctly bounces, we can simply
use the command sense_buffer to send to retrieve sense information and
junk the unnecessary page allocation.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/scsi_error.c

index e8350c562d24c0a4598d7a4c0e4066c1b4911d35..9adb64ac054c68f869d83ede1b82d42edbdb4461 100644 (file)
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/scatterlist.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -640,16 +640,8 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
        memcpy(scmd->cmnd, cmnd, cmnd_size);
 
        if (copy_sense) {
-               gfp_t gfp_mask = GFP_ATOMIC;
-
-               if (shost->hostt->unchecked_isa_dma)
-                       gfp_mask |= __GFP_DMA;
-
-               sgl.page = alloc_page(gfp_mask);
-               if (!sgl.page)
-                       return FAILED;
-               sgl.offset = 0;
-               sgl.length = 252;
+               sg_init_one(&sgl, scmd->sense_buffer,
+                           sizeof(scmd->sense_buffer));
 
                scmd->sc_data_direction = DMA_FROM_DEVICE;
                scmd->request_bufflen = sgl.length;
@@ -719,18 +711,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
        }
 
 
-       /*
-        * Last chance to have valid sense data.
-        */
-       if (copy_sense) {
-               if (!SCSI_SENSE_VALID(scmd)) {
-                       memcpy(scmd->sense_buffer, page_address(sgl.page),
-                              sizeof(scmd->sense_buffer));
-               }
-               __free_page(sgl.page);
-       }
-
-
        /*
         * Restore original data
         */