# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1178010516 -3600
# Node ID 5b4a02335182a331519840d57308fbc2f027316d
# Parent 1ddaf2650633ef9217e884c61832fa68317995f5
linux blkback/blktap: Request/response identifiers are u64, not long.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 6 +++---
linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff -r 1ddaf2650633 -r 5b4a02335182
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c Mon Apr 30
15:06:34 2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c Tue May 01
10:08:36 2007 +0100
@@ -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 void dispatch_rw_block_io(blkif_t
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
*/
-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 -r 1ddaf2650633 -r 5b4a02335182
linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c Mon Apr 30 15:06:34
2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c Tue May 01 10:08:36
2007 +0100
@@ -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 void dispatch_rw_block_io(blkif_t
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
*/
-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;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|