From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Wed, 24 Aug 2005 21:50:52 +0000 (+0000)
Subject: Rename grant-id to ring-ref.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16844^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d90a3a88c0895f924609743537cd04031a415b93;p=xen.git

Rename grant-id to ring-ref.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
index 61861b3735..0872124919 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
@@ -57,7 +57,7 @@ static int blkback_remove(struct xenbus_device *dev)
 /* Front end tells us frame. */
 static void frontend_changed(struct xenbus_watch *watch, const char *node)
 {
-	unsigned long sharedmfn;
+	unsigned long ring_ref;
 	unsigned int evtchn;
 	int err;
 	struct backend_info *be
@@ -72,11 +72,11 @@ static void frontend_changed(struct xenbus_watch *watch, const char *node)
 	if (be->blkif == NULL || be->blkif->status == CONNECTED)
 		return;
 
-	err = xenbus_gather(be->frontpath, "grant-id", "%lu", &sharedmfn,
+	err = xenbus_gather(be->frontpath, "ring-ref", "%lu", &ring_ref,
 			    "event-channel", "%u", &evtchn, NULL);
 	if (err) {
 		xenbus_dev_error(be->dev, err,
-				 "reading %s/grant-id and event-channel",
+				 "reading %s/ring-ref and event-channel",
 				 be->frontpath);
 		return;
 	}
@@ -113,11 +113,10 @@ static void frontend_changed(struct xenbus_watch *watch, const char *node)
 	}
 
 	/* Map the shared frame, irq etc. */
-	err = blkif_map(be->blkif, sharedmfn, evtchn);
+	err = blkif_map(be->blkif, ring_ref, evtchn);
 	if (err) {
-		xenbus_dev_error(be->dev, err,
-				 "mapping shared-frame %lu port %u",
-				 sharedmfn, evtchn);
+		xenbus_dev_error(be->dev, err, "mapping ring-ref %lu port %u",
+				 ring_ref, evtchn);
 		goto abort;
 	}
 
diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
index ee41bdffe6..39b0d35270 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -1123,12 +1123,12 @@ static int setup_blkring(struct xenbus_device *dev, struct blkfront_info *info)
 		xenbus_dev_error(dev, err, "granting access to ring page");
 		return err;
 	}
-	info->grant_id = err;
+	info->ring_ref = err;
 
 	op.u.alloc_unbound.dom = info->backend_id;
 	err = HYPERVISOR_event_channel_op(&op);
 	if (err) {
-		gnttab_end_foreign_access(info->grant_id, 0);
+		gnttab_end_foreign_access(info->ring_ref, 0);
 		free_page((unsigned long)info->ring.sring);
 		info->ring.sring = 0;
 		xenbus_dev_error(dev, err, "allocating event channel");
@@ -1176,9 +1176,9 @@ static int talk_to_backend(struct xenbus_device *dev,
 		goto destroy_blkring;
 	}
 
-	err = xenbus_printf(dev->nodename, "grant-id","%u", info->grant_id);
+	err = xenbus_printf(dev->nodename, "ring-ref","%u", info->ring_ref);
 	if (err) {
-		message = "writing grant-id";
+		message = "writing ring-ref";
 		goto abort_transaction;
 	}
 	err = xenbus_printf(dev->nodename,
diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index cbb7def425..93e9db08eb 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@ -112,7 +112,7 @@ struct blkfront_info
 	int connected;
 	char *backend;
 	int backend_id;
-	int grant_id;
+	int ring_ref;
 	blkif_front_ring_t ring;
 	unsigned int evtchn;
 	struct xlbd_major_info *mi;