1.1 --- a/tools/fs-back/fs-backend.c	Tue Jul 22 07:59:44 2008 +0100
     1.2 +++ b/tools/fs-back/fs-backend.c	Tue Jul 22 08:00:43 2008 +0100
     1.3 @@ -239,7 +239,7 @@ static void handle_connection(int fronte
     1.4                                      mount->dom_id,
     1.5                                      mount->gref,
     1.6                                      PROT_READ | PROT_WRITE);
     1.7 -    BACK_RING_INIT(&mount->ring, sring, PAGE_SIZE);
     1.8 +    BACK_RING_INIT(&mount->ring, sring, XC_PAGE_SIZE);
     1.9      mount->nr_entries = mount->ring.nr_ents; 
    1.10      for (i = 0; i < MAX_FDS; i++)
    1.11          mount->fds[i] = -1;

     2.1 --- a/tools/fs-back/fs-ops.c	Tue Jul 22 07:59:44 2008 +0100
     2.2 +++ b/tools/fs-back/fs-ops.c	Tue Jul 22 08:00:43 2008 +0100
     2.3 @@ -515,9 +515,9 @@ void dispatch_list(struct mount *mount, 
     2.4      /* If there was any error with reading the directory, errno will be set */
     2.5      error_code = errno;
     2.6      /* Copy file names of the remaining non-NULL dirents into buf */
     2.7 -    assert(NAME_MAX < PAGE_SIZE >> 1);
     2.8 +    assert(NAME_MAX < XC_PAGE_SIZE >> 1);
     2.9      while(dirent != NULL && 
    2.10 -            (PAGE_SIZE - ((unsigned long)buf & PAGE_MASK) > NAME_MAX))
    2.11 +            (XC_PAGE_SIZE - ((unsigned long)buf & XC_PAGE_MASK) > NAME_MAX))
    2.12      {
    2.13          int curr_length = strlen(dirent->d_name) + 1;
    2.14