ia64/xen-unstable

changeset 14987:5b4a02335182

linux blkback/blktap: Request/response identifiers are u64, not long.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Tue May 01 10:08:36 2007 +0100 (2007-05-01)
parents 1ddaf2650633
children 476efa5c9abf
files linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Apr 30 15:06:34 2007 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue May 01 10:08:36 2007 +0100
     1.3 @@ -70,7 +70,7 @@ module_param(debug_lvl, int, 0644);
     1.4   */
     1.5  typedef struct {
     1.6  	blkif_t       *blkif;
     1.7 -	unsigned long  id;
     1.8 +	u64            id;
     1.9  	int            nr_pages;
    1.10  	atomic_t       pendcnt;
    1.11  	unsigned short operation;
    1.12 @@ -107,7 +107,7 @@ static int do_block_io_op(blkif_t *blkif
    1.13  static void dispatch_rw_block_io(blkif_t *blkif,
    1.14  				 blkif_request_t *req,
    1.15  				 pending_req_t *pending_req);
    1.16 -static void make_response(blkif_t *blkif, unsigned long id, 
    1.17 +static void make_response(blkif_t *blkif, u64 id,
    1.18  			  unsigned short op, int st);
    1.19  
    1.20  /******************************************************************
    1.21 @@ -515,7 +515,7 @@ static void dispatch_rw_block_io(blkif_t
    1.22   */
    1.23  
    1.24  
    1.25 -static void make_response(blkif_t *blkif, unsigned long id, 
    1.26 +static void make_response(blkif_t *blkif, u64 id,
    1.27  			  unsigned short op, int st)
    1.28  {
    1.29  	blkif_response_t  resp;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Mon Apr 30 15:06:34 2007 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Tue May 01 10:08:36 2007 +0100
     2.3 @@ -136,7 +136,7 @@ module_param(debug_lvl, int, 0644);
     2.4   */
     2.5  typedef struct {
     2.6  	blkif_t       *blkif;
     2.7 -	unsigned long  id;
     2.8 +	u64            id;
     2.9  	unsigned short mem_idx;
    2.10  	int            nr_pages;
    2.11  	atomic_t       pendcnt;
    2.12 @@ -741,7 +741,7 @@ static int do_block_io_op(blkif_t *blkif
    2.13  static void dispatch_rw_block_io(blkif_t *blkif,
    2.14  				 blkif_request_t *req,
    2.15  				 pending_req_t *pending_req);
    2.16 -static void make_response(blkif_t *blkif, unsigned long id, 
    2.17 +static void make_response(blkif_t *blkif, u64 id,
    2.18                            unsigned short op, int st);
    2.19  
    2.20  /******************************************************************
    2.21 @@ -1408,7 +1408,7 @@ static void dispatch_rw_block_io(blkif_t
    2.22   */
    2.23  
    2.24  
    2.25 -static void make_response(blkif_t *blkif, unsigned long id, 
    2.26 +static void make_response(blkif_t *blkif, u64 id,
    2.27                            unsigned short op, int st)
    2.28  {
    2.29  	blkif_response_t  resp;