KVM: Add kvm_read_guest_atomic()

[safe/jmp/linux-2.6] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 06229f2..82c06f0 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -38,6 +38,7 @@
 #include <linux/proc_fs.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
+#include <linux/scatterlist.h>
 
 #include <linux/blkdev.h>
 #include "scsi.h"
@@ -328,7 +329,7 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)
        if (done == NULL)
                return 0;       /* assume mid level reprocessing command */
 
-       SCpnt->resid = 0;
+       scsi_set_resid(SCpnt, 0);
        if ((SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) && cmd) {
                printk(KERN_INFO "scsi_debug: cmd ");
                for (k = 0, len = SCpnt->cmd_len; k < len; ++k)
@@ -600,35 +601,25 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
        int k, req_len, act_len, len, active;
        void * kaddr;
        void * kaddr_off;
-       struct scatterlist * sgpnt;
+       struct scatterlist * sg;
 
-       if (0 == scp->request_bufflen)
+       if (0 == scsi_bufflen(scp))
                return 0;
-       if (NULL == scp->request_buffer)
+       if (NULL == scsi_sglist(scp))
                return (DID_ERROR << 16);
        if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) ||
              (scp->sc_data_direction == DMA_FROM_DEVICE)))
                return (DID_ERROR << 16);
-       if (0 == scp->use_sg) {
-               req_len = scp->request_bufflen;
-               act_len = (req_len < arr_len) ? req_len : arr_len;
-               memcpy(scp->request_buffer, arr, act_len);
-               if (scp->resid)
-                       scp->resid -= act_len;
-               else
-                       scp->resid = req_len - act_len;
-               return 0;
-       }
-       sgpnt = (struct scatterlist *)scp->request_buffer;
        active = 1;
-       for (k = 0, req_len = 0, act_len = 0; k < scp->use_sg; ++k, ++sgpnt) {
+       req_len = act_len = 0;
+       scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) {
                if (active) {
                        kaddr = (unsigned char *)
-                               kmap_atomic(sgpnt->page, KM_USER0);
+                               kmap_atomic(sg_page(sg), KM_USER0);
                        if (NULL == kaddr)
                                return (DID_ERROR << 16);
-                       kaddr_off = (unsigned char *)kaddr + sgpnt->offset;
-                       len = sgpnt->length;
+                       kaddr_off = (unsigned char *)kaddr + sg->offset;
+                       len = sg->length;
                        if ((req_len + len) > arr_len) {
                                active = 0;
                                len = arr_len - req_len;
@@ -637,12 +628,12 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
                        kunmap_atomic(kaddr, KM_USER0);
                        act_len += len;
                }
-               req_len += sgpnt->length;
+               req_len += sg->length;
        }
-       if (scp->resid)
-               scp->resid -= act_len;
+       if (scsi_get_resid(scp))
+               scsi_set_resid(scp, scsi_get_resid(scp) - act_len);
        else
-               scp->resid = req_len - act_len;
+               scsi_set_resid(scp, req_len - act_len);
        return 0;
 }
 
@@ -653,28 +644,22 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
        int k, req_len, len, fin;
        void * kaddr;
        void * kaddr_off;
-       struct scatterlist * sgpnt;
+       struct scatterlist * sg;
 
-       if (0 == scp->request_bufflen)
+       if (0 == scsi_bufflen(scp))
                return 0;
-       if (NULL == scp->request_buffer)
+       if (NULL == scsi_sglist(scp))
                return -1;
        if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) ||
              (scp->sc_data_direction == DMA_TO_DEVICE)))
                return -1;
-       if (0 == scp->use_sg) {
-               req_len = scp->request_bufflen;
-               len = (req_len < max_arr_len) ? req_len : max_arr_len;
-               memcpy(arr, scp->request_buffer, len);
-               return len;
-       }
-       sgpnt = (struct scatterlist *)scp->request_buffer;
-       for (k = 0, req_len = 0, fin = 0; k < scp->use_sg; ++k, ++sgpnt) {
-               kaddr = (unsigned char *)kmap_atomic(sgpnt->page, KM_USER0);
+       req_len = fin = 0;
+       scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) {
+               kaddr = (unsigned char *)kmap_atomic(sg_page(sg), KM_USER0);
                if (NULL == kaddr)
                        return -1;
-               kaddr_off = (unsigned char *)kaddr + sgpnt->offset;
-               len = sgpnt->length;
+               kaddr_off = (unsigned char *)kaddr + sg->offset;
+               len = sg->length;
                if ((req_len + len) > max_arr_len) {
                        len = max_arr_len - req_len;
                        fin = 1;
@@ -683,7 +668,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
                kunmap_atomic(kaddr, KM_USER0);
                if (fin)
                        return req_len + len;
-               req_len += sgpnt->length;
+               req_len += sg->length;
        }
        return req_len;
 }
@@ -2405,7 +2390,7 @@ MODULE_PARM_DESC(add_host, "0..127 hosts allowed(def=1)");
 MODULE_PARM_DESC(delay, "# of jiffies to delay response(def=1)");
 MODULE_PARM_DESC(dev_size_mb, "size in MB of ram shared by devs(def=8)");
 MODULE_PARM_DESC(dsense, "use descriptor sense format(def=0 -> fixed)");
-MODULE_PARM_DESC(every_nth, "timeout every nth command(def=100)");
+MODULE_PARM_DESC(every_nth, "timeout every nth command(def=0)");
 MODULE_PARM_DESC(fake_rw, "fake reads/writes instead of copying (def=0)");
 MODULE_PARM_DESC(max_luns, "number of LUNs per target to simulate(def=1)");
 MODULE_PARM_DESC(no_lun_0, "no LU number 0 (def=0 -> have lun 0)");
@@ -2875,7 +2860,7 @@ static int __init scsi_debug_init(void)
 
        init_all_queued();
 
-       sdebug_driver_template.proc_name = (char *)sdebug_proc_name;
+       sdebug_driver_template.proc_name = sdebug_proc_name;
 
        host_to_add = scsi_debug_add_host;
         scsi_debug_add_host = 0;