uml: fix request->sector update

[karo-tx-linux.git] / arch / um / drivers / ubd_kern.c

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 70509ddaac035cd60537e286883614323410be6d..0947f2e200456c2136e8d7520164dda4636fa203 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -20,6 +20,7 @@
 #define MAJOR_NR UBD_MAJOR
 #define UBD_SHIFT 4
 
+#include "linux/kernel.h"
 #include "linux/module.h"
 #include "linux/blkdev.h"
 #include "linux/hdreg.h"
@@ -1082,7 +1083,7 @@ static void do_ubd_request(request_queue_t *q)
 {
        struct io_thread_req *io_req;
        struct request *req;
-       int n;
+       int n, last_sectors;
 
        while(1){
                struct ubd *dev = q->queuedata;
@@ -1098,9 +1099,11 @@ static void do_ubd_request(request_queue_t *q)
                }
 
                req = dev->request;
+               last_sectors = 0;
                while(dev->start_sg < dev->end_sg){
                        struct scatterlist *sg = &dev->sg[dev->start_sg];
 
+                       req->sector += last_sectors;
                        io_req = kmalloc(sizeof(struct io_thread_req),
                                         GFP_ATOMIC);
                        if(io_req == NULL){
@@ -1112,6 +1115,7 @@ static void do_ubd_request(request_queue_t *q)
                                        (unsigned long long) req->sector << 9,
                                        sg->offset, sg->length, sg->page);
 
+                       last_sectors = sg->length >> 9;
                        n = os_write_file(thread_fd, &io_req,
                                          sizeof(struct io_thread_req *));
                        if(n != sizeof(struct io_thread_req *)){
@@ -1123,7 +1127,6 @@ static void do_ubd_request(request_queue_t *q)
                                return;
                        }
 
-                       req->sector += sg->length >> 9;
                        dev->start_sg++;
                }
                dev->end_sg = 0;