xen/xenbus: Rename *RING_PAGE* to *RING_GRANT*

Linux may use a different page size than the size of grant. So make
clear that the order is actually in number of grant.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 809634ce3b67..f9099940c272 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(max_persistent_grants,
  * Maximum order of pages to be used for the shared ring between front and
  * backend, 4KB page granularity is used.
  */
-unsigned int xen_blkif_max_ring_order = XENBUS_MAX_RING_PAGE_ORDER;
+unsigned int xen_blkif_max_ring_order = XENBUS_MAX_RING_GRANT_ORDER;
 module_param_named(max_ring_page_order, xen_blkif_max_ring_order, int, S_IRUGO);
 MODULE_PARM_DESC(max_ring_page_order, "Maximum order of pages to be used for the shared ring");
 /*
@@ -1446,10 +1446,10 @@ static int __init xen_blkif_init(void)
         if (!xen_domain())
                 return -ENODEV;
 
-        if (xen_blkif_max_ring_order > XENBUS_MAX_RING_PAGE_ORDER) {
+        if (xen_blkif_max_ring_order > XENBUS_MAX_RING_GRANT_ORDER) {
                 pr_info("Invalid max_ring_order (%d), will use default max: %d.\n",
-                        xen_blkif_max_ring_order, XENBUS_MAX_RING_PAGE_ORDER);
-                xen_blkif_max_ring_order = XENBUS_MAX_RING_PAGE_ORDER;
+                        xen_blkif_max_ring_order, XENBUS_MAX_RING_GRANT_ORDER);
+                xen_blkif_max_ring_order = XENBUS_MAX_RING_GRANT_ORDER;
         }
 
         rc = xen_blkif_interface_init();
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 01c6b41de4e5..f53cff42f8da 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -829,7 +829,7 @@ again:
 static int connect_ring(struct backend_info *be)
 {
         struct xenbus_device *dev = be->dev;
-        unsigned int ring_ref[XENBUS_MAX_RING_PAGES];
+        unsigned int ring_ref[XENBUS_MAX_RING_GRANTS];
         unsigned int evtchn, nr_grefs, ring_page_order;
         unsigned int pers_grants;
         char protocol[64] = "";