Use shared mapping to reserve memory when creating locale archive

diff --git a/ChangeLog b/ChangeLog
index c5ba42c712a235f840cfb6ab92f55f84190ff19f..bbd60761a49d8a384fa515d96aac5eb2dfbe0a8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
+
+       [BZ #10855]
+       * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
+       used later with MMAP_FIXED | MMAP_SHARED to cope with different
+       alignment restrictions.
+
 2010-02-08  Andreas Schwab  <schwab@redhat.com>
 
        [BZ #11155]

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index a58505852d86b0e9117f3e9a197dd8ce7997ee31..4335369d61eaa7f680f1c3e768b1f0d2c7a4156b 100644 (file)
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
   size_t reserved = RESERVE_MMAP_SIZE;
   int xflags = 0;
   if (total < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
                       -1, 0)) != MAP_FAILED))
     xflags = MAP_FIXED;
   else
@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
   size_t reserved = RESERVE_MMAP_SIZE;
   int xflags = 0;
   if (total < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
                       -1, 0)) != MAP_FAILED))
     xflags = MAP_FIXED;
   else
@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly)
   int xflags = 0;
   void *p;
   if (st.st_size < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
                       -1, 0)) != MAP_FAILED))
     xflags = MAP_FIXED;
   else