fs-back: fix compilation error.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 22 Jul 2008 07:00:43 +0000 (08:00 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 22 Jul 2008 07:00:43 +0000 (08:00 +0100)
XC_PAGE_SIZE and XC_PAGE_MASK should be used instead of PAGE_SIZE
and PAGE_MASK.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
tools/fs-back/fs-backend.c
tools/fs-back/fs-ops.c

index 22686b82b202e914e2dd606e8d55db2f98593a42..cdf3edbf0b34b6b40a3bc29c8b5c54db05677d3f 100644 (file)
@@ -239,7 +239,7 @@ static void handle_connection(int frontend_dom_id, int export_id, char *frontend
                                     mount->dom_id,
                                     mount->gref,
                                     PROT_READ | PROT_WRITE);
-    BACK_RING_INIT(&mount->ring, sring, PAGE_SIZE);
+    BACK_RING_INIT(&mount->ring, sring, XC_PAGE_SIZE);
     mount->nr_entries = mount->ring.nr_ents; 
     for (i = 0; i < MAX_FDS; i++)
         mount->fds[i] = -1;
index d55e9565246f542862926d710f60a29ef7e76483..6315a4d9759b1218b4dafa0932715386fdfce6ad 100644 (file)
@@ -515,9 +515,9 @@ void dispatch_list(struct mount *mount, struct fsif_request *req)
     /* If there was any error with reading the directory, errno will be set */
     error_code = errno;
     /* Copy file names of the remaining non-NULL dirents into buf */
-    assert(NAME_MAX < PAGE_SIZE >> 1);
+    assert(NAME_MAX < XC_PAGE_SIZE >> 1);
     while(dirent != NULL && 
-            (PAGE_SIZE - ((unsigned long)buf & PAGE_MASK) > NAME_MAX))
+            (XC_PAGE_SIZE - ((unsigned long)buf & XC_PAGE_MASK) > NAME_MAX))
     {
         int curr_length = strlen(dirent->d_name) + 1;