[Minios-devel] [UNIKRAFT PATCH v2 2/2] lib/ramfs, vfscore, ukallocbbudy: Change the macro in vfscore and buddyalloc

[Vlad-Andrei BĂDOIU (78692) <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>]

This patch adapts the vfscore,ramfs and ukallocbuddy code
to work with the new page.h header.

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
---
 lib/ramfs/ramfs_vnops.c            | 4 ++--
 lib/ukallocbbuddy/bbuddy.c         | 4 +---
 lib/vfscore/include/vfscore/prex.h | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/ramfs/ramfs_vnops.c b/lib/ramfs/ramfs_vnops.c
index 58f78c00..ca01825a 100644
--- a/lib/ramfs/ramfs_vnops.c
+++ b/lib/ramfs/ramfs_vnops.c
@@ -354,7 +354,7 @@ ramfs_truncate(struct vnode *vp, off_t length)
                }
        } else if ((size_t) length > np->rn_bufsize) {
                /* TODO: this could use a page level allocator */
-               new_size = round_page(length);
+               new_size = round_pgup(length);
                new_buf = malloc(new_size);
                if (!new_buf)
                        return EIO;
@@ -469,7 +469,7 @@ ramfs_write(struct vnode *vp, struct uio *uio, int ioflag)
 
                if (end_pos > (off_t) np->rn_bufsize) {
                        // XXX: this could use a page level allocator
-                       size_t new_size = round_page(end_pos);
+                       size_t new_size = round_pgup(end_pos);
                        void *new_buf = malloc(new_size);
 
                        if (!new_buf)
diff --git a/lib/ukallocbbuddy/bbuddy.c b/lib/ukallocbbuddy/bbuddy.c
index 13a7942b..eb47e391 100644
--- a/lib/ukallocbbuddy/bbuddy.c
+++ b/lib/ukallocbbuddy/bbuddy.c
@@ -45,6 +45,7 @@
 #include <uk/arch/limits.h>
 #include <uk/print.h>
 #include <uk/assert.h>
+#include <uk/page.h>
 
 typedef struct chunk_head_st chunk_head_t;
 typedef struct chunk_tail_st chunk_tail_t;
@@ -79,9 +80,6 @@ struct uk_bbpalloc {
        struct uk_bbpalloc_memr *memr_head;
 };
 
-#define round_pgup(a)   ALIGN_UP((a), __PAGE_SIZE)
-#define round_pgdown(a) ALIGN_DOWN((a), __PAGE_SIZE)
-
 /*********************
  * ALLOCATION BITMAP
  *  One bit per page of memory. Bit set => page is allocated.
diff --git a/lib/vfscore/include/vfscore/prex.h 
b/lib/vfscore/include/vfscore/prex.h
index bfa95655..c1966440 100644
--- a/lib/vfscore/include/vfscore/prex.h
+++ b/lib/vfscore/include/vfscore/prex.h
@@ -38,13 +38,12 @@
 
 
 #include <unistd.h>
+#include <uk/page.h>
 
 #define        BSIZE   512             /* size of secondary block (bytes) */
 
 #define DO_RDWR                0x2
 
-#define round_page(x)  (((x) + __PAGE_MASK) & ~__PAGE_MASK)
-
 size_t strlcat(char *dst, const char *src, size_t siz);
 size_t strlcpy(char *dst, const char *src, size_t siz);
 
-- 
2.20.1

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel