diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-05-01 10:08:36 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-05-01 10:08:36 +0100 |
| commit | e1064ed49951c18d968e957aed56a177b4150dcd (patch) | |
| tree | 6255f0d6e63b68e0d0c7aaf2c7215e28d50cae9c | |
| parent | e050e9784befb67c31cb87b5767cc8d715883888 (diff) | |
| download | xen-e1064ed49951c18d968e957aed56a177b4150dcd.tar.gz xen-e1064ed49951c18d968e957aed56a177b4150dcd.tar.bz2 xen-e1064ed49951c18d968e957aed56a177b4150dcd.zip | |
linux blkback/blktap: Request/response identifiers are u64, not long.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 6 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index edd26a3b18..8d529c7168 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -70,7 +70,7 @@ module_param(debug_lvl, int, 0644); */ typedef struct { blkif_t *blkif; - unsigned long id; + u64 id; int nr_pages; atomic_t pendcnt; unsigned short operation; @@ -107,7 +107,7 @@ static int do_block_io_op(blkif_t *blkif); static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req, pending_req_t *pending_req); -static void make_response(blkif_t *blkif, unsigned long id, +static void make_response(blkif_t *blkif, u64 id, unsigned short op, int st); /****************************************************************** @@ -515,7 +515,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, */ -static void make_response(blkif_t *blkif, unsigned long id, +static void make_response(blkif_t *blkif, u64 id, unsigned short op, int st) { blkif_response_t resp; diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c index 4fdb601ebe..fc36a768f9 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c @@ -136,7 +136,7 @@ module_param(debug_lvl, int, 0644); */ typedef struct { blkif_t *blkif; - unsigned long id; + u64 id; unsigned short mem_idx; int nr_pages; atomic_t pendcnt; @@ -741,7 +741,7 @@ static int do_block_io_op(blkif_t *blkif); static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req, pending_req_t *pending_req); -static void make_response(blkif_t *blkif, unsigned long id, +static void make_response(blkif_t *blkif, u64 id, unsigned short op, int st); /****************************************************************** @@ -1408,7 +1408,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, */ -static void make_response(blkif_t *blkif, unsigned long id, +static void make_response(blkif_t *blkif, u64 id, unsigned short op, int st) { blkif_response_t resp; |