[Xen-changelog] [xen-unstable] fs-back: fix compilation error.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216710043 -3600
# Node ID aa4d69e16f0e840cf238650c7985c106c5ef66e9
# Parent  f528dd7fae7beea62a6d8a597b0cb4909a6e49eb
fs-back: fix compilation error.

XC_PAGE_SIZE and XC_PAGE_MASK should be used instead of PAGE_SIZE
and PAGE_MASK.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 tools/fs-back/fs-backend.c |    2 +-
 tools/fs-back/fs-ops.c     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r f528dd7fae7b -r aa4d69e16f0e tools/fs-back/fs-backend.c
--- a/tools/fs-back/fs-backend.c        Tue Jul 22 07:59:44 2008 +0100
+++ b/tools/fs-back/fs-backend.c        Tue Jul 22 08:00:43 2008 +0100
@@ -239,7 +239,7 @@ static void handle_connection(int fronte
                                     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;
diff -r f528dd7fae7b -r aa4d69e16f0e tools/fs-back/fs-ops.c
--- a/tools/fs-back/fs-ops.c    Tue Jul 22 07:59:44 2008 +0100
+++ b/tools/fs-back/fs-ops.c    Tue Jul 22 08:00:43 2008 +0100
@@ -515,9 +515,9 @@ void dispatch_list(struct mount *mount, 
     /* 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;
         

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog