Let eltpools maintain the number of allocated items. The overhead

[libucw.git] / lib / partmap.c

diff --git a/lib/partmap.c b/lib/partmap.c
index 49f12322492d60fc261260ebeec148aa28182e96..2b70f1d916f6e16e0235687f0f51007aac44f849 100644 (file)
--- a/lib/partmap.c
+++ b/lib/partmap.c
@@ -18,7 +18,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <sys/user.h>
 
 #ifdef CONFIG_PARTMAP_IS_MMAP
 #define PARTMAP_WINDOW ~(size_t)0
@@ -31,7 +30,7 @@
 #endif
 
 struct partmap *
-partmap_open(byte *name, int writeable)
+partmap_open(char *name, int writeable)
 {
   struct partmap *p = xmalloc_zero(sizeof(struct partmap));
 
@@ -68,15 +67,15 @@ partmap_load(struct partmap *p, sh_off_t start, uns size)
   if (p->start_map)
     munmap(p->start_map, p->end_off - p->start_off);
   sh_off_t end = start + size;
-  sh_off_t win_start = start/PAGE_SIZE * PAGE_SIZE;
+  sh_off_t win_start = start/CPU_PAGE_SIZE * CPU_PAGE_SIZE;
   size_t win_len = PARTMAP_WINDOW;
   if ((sh_off_t) (win_start+win_len) > p->file_size)
-    win_len = ALIGN(p->file_size - win_start, PAGE_SIZE);
+    win_len = ALIGN_TO(p->file_size - win_start, CPU_PAGE_SIZE);
   if ((sh_off_t) (win_start+win_len) < end)
     die("partmap_map: Window is too small for mapping %d bytes", size);
   p->start_map = sh_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
   if (p->start_map == MAP_FAILED)
-    die("mmap failed at position %Ld: %m", (long long)win_start);
+    die("mmap failed at position %lld: %m", (long long)win_start);
   p->start_off = win_start;
   p->end_off = win_start+win_len;
   madvise(p->start_map, win_len, MADV_SEQUENTIAL);