1.1 --- a/drivers/xen/blktap2/device.c	Tue Jun 16 11:06:10 2009 +0100
     1.2 +++ b/drivers/xen/blktap2/device.c	Tue Jun 16 11:07:19 2009 +0100
     1.3 @@ -825,8 +825,8 @@ blktap_device_run_queue(struct blktap *t
     1.4  
     1.5  		BTDBG("req %p: dev %d cmd %p, sec 0x%llx, (0x%x/0x%lx) "
     1.6  		      "buffer:%p [%s], pending: %p\n", req, tap->minor,
     1.7 -		      req->cmd, req->sector, req->current_nr_sectors,
     1.8 -		      req->nr_sectors, req->buffer,
     1.9 +		      req->cmd, (unsigned long long)req->sector,
    1.10 +		      req->current_nr_sectors, req->nr_sectors, req->buffer,
    1.11  		      rq_data_dir(req) ? "write" : "read", request);
    1.12  
    1.13  		blkdev_dequeue_request(req);
    1.14 @@ -880,7 +880,8 @@ blktap_device_do_request(request_queue_t
    1.15  fail:
    1.16  	while ((req = elv_next_request(rq))) {
    1.17  		BTERR("device closed: failing secs %llu - %llu\n",
    1.18 -		      req->sector, req->sector + req->nr_sectors);
    1.19 +		      (unsigned long long)req->sector,
    1.20 +		      (unsigned long long)req->sector + req->nr_sectors);
    1.21  		end_request(req, 0);
    1.22  	}
    1.23  }