1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Wed Aug 24 20:43:16 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Wed Aug 24 21:50:52 2005 +0000
     1.3 @@ -57,7 +57,7 @@ static int blkback_remove(struct xenbus_
     1.4  /* Front end tells us frame. */
     1.5  static void frontend_changed(struct xenbus_watch *watch, const char *node)
     1.6  {
     1.7 -	unsigned long sharedmfn;
     1.8 +	unsigned long ring_ref;
     1.9  	unsigned int evtchn;
    1.10  	int err;
    1.11  	struct backend_info *be
    1.12 @@ -72,11 +72,11 @@ static void frontend_changed(struct xenb
    1.13  	if (be->blkif == NULL || be->blkif->status == CONNECTED)
    1.14  		return;
    1.15  
    1.16 -	err = xenbus_gather(be->frontpath, "grant-id", "%lu", &sharedmfn,
    1.17 +	err = xenbus_gather(be->frontpath, "ring-ref", "%lu", &ring_ref,
    1.18  			    "event-channel", "%u", &evtchn, NULL);
    1.19  	if (err) {
    1.20  		xenbus_dev_error(be->dev, err,
    1.21 -				 "reading %s/grant-id and event-channel",
    1.22 +				 "reading %s/ring-ref and event-channel",
    1.23  				 be->frontpath);
    1.24  		return;
    1.25  	}
    1.26 @@ -113,11 +113,10 @@ static void frontend_changed(struct xenb
    1.27  	}
    1.28  
    1.29  	/* Map the shared frame, irq etc. */
    1.30 -	err = blkif_map(be->blkif, sharedmfn, evtchn);
    1.31 +	err = blkif_map(be->blkif, ring_ref, evtchn);
    1.32  	if (err) {
    1.33 -		xenbus_dev_error(be->dev, err,
    1.34 -				 "mapping shared-frame %lu port %u",
    1.35 -				 sharedmfn, evtchn);
    1.36 +		xenbus_dev_error(be->dev, err, "mapping ring-ref %lu port %u",
    1.37 +				 ring_ref, evtchn);
    1.38  		goto abort;
    1.39  	}
    1.40  

     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Aug 24 20:43:16 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Aug 24 21:50:52 2005 +0000
     2.3 @@ -1123,12 +1123,12 @@ static int setup_blkring(struct xenbus_d
     2.4  		xenbus_dev_error(dev, err, "granting access to ring page");
     2.5  		return err;
     2.6  	}
     2.7 -	info->grant_id = err;
     2.8 +	info->ring_ref = err;
     2.9  
    2.10  	op.u.alloc_unbound.dom = info->backend_id;
    2.11  	err = HYPERVISOR_event_channel_op(&op);
    2.12  	if (err) {
    2.13 -		gnttab_end_foreign_access(info->grant_id, 0);
    2.14 +		gnttab_end_foreign_access(info->ring_ref, 0);
    2.15  		free_page((unsigned long)info->ring.sring);
    2.16  		info->ring.sring = 0;
    2.17  		xenbus_dev_error(dev, err, "allocating event channel");
    2.18 @@ -1176,9 +1176,9 @@ static int talk_to_backend(struct xenbus
    2.19  		goto destroy_blkring;
    2.20  	}
    2.21  
    2.22 -	err = xenbus_printf(dev->nodename, "grant-id","%u", info->grant_id);
    2.23 +	err = xenbus_printf(dev->nodename, "ring-ref","%u", info->ring_ref);
    2.24  	if (err) {
    2.25 -		message = "writing grant-id";
    2.26 +		message = "writing ring-ref";
    2.27  		goto abort_transaction;
    2.28  	}
    2.29  	err = xenbus_printf(dev->nodename,

     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Aug 24 20:43:16 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Aug 24 21:50:52 2005 +0000
     3.3 @@ -112,7 +112,7 @@ struct blkfront_info
     3.4  	int connected;
     3.5  	char *backend;
     3.6  	int backend_id;
     3.7 -	int grant_id;
     3.8 +	int ring_ref;
     3.9  	blkif_front_ring_t ring;
    3.10  	unsigned int evtchn;
    3.11  	struct xlbd_major_info *mi;