diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-08-08 20:42:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-08-08 20:42:33 +0000 |
| commit | f54a329a28050846c0475b45f8bf131f66eab996 (patch) | |
| tree | afa7b9a28fcc411dd84e30dcc8bd413f4a795866 | |
| parent | e62995c1121da99a64657bb952b20d08de0b932e (diff) | |
| download | glibc-f54a329a28050846c0475b45f8bf131f66eab996.tar.gz glibc-f54a329a28050846c0475b45f8bf131f66eab996.tar.xz glibc-f54a329a28050846c0475b45f8bf131f66eab996.zip | |
* nscd/mem.c (mempool_alloc): Use posix_fallocate instead of ftruncate.
* nscd/connections.c (nscd_init): Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nscd/connections.c | 2 | ||||
| -rw-r--r-- | nscd/mem.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 489320ec87..10e137892d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-08 Ulrich Drepper <drepper@redhat.com> + + * nscd/mem.c (mempool_alloc): Use posix_fallocate instead of ftruncate. + * nscd/connections.c (nscd_init): Likewise. + 2005-08-08 Jakub Jelinek <jakub@redhat.com> * stdio-common/fxprintf.c: Include libioP.h. diff --git a/nscd/connections.c b/nscd/connections.c index 808ea33adb..7ead3fd5e7 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -638,7 +638,7 @@ cannot create read-only descriptor for \"%s\"; no mmap"), if ((TEMP_FAILURE_RETRY (write (fd, &head, sizeof (head))) != sizeof (head)) - || ftruncate (fd, total) != 0 + || posix_fallocate (fd, 0, total) != 0 || (mem = mmap (NULL, total, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) { diff --git a/nscd/mem.c b/nscd/mem.c index a1108f3143..823eda1019 100644 --- a/nscd/mem.c +++ b/nscd/mem.c @@ -21,6 +21,7 @@ #include <assert.h> #include <errno.h> #include <error.h> +#include <fcntl.h> #include <inttypes.h> #include <libintl.h> #include <limits.h> @@ -488,7 +489,8 @@ mempool_alloc (struct database_dyn *db, size_t len) + db->head->module * sizeof (ref_t) + new_data_size); - if ((!db->mmap_used || ftruncate (db->wr_fd, newtotal) != 0) + if ((!db->mmap_used + || posix_fallocate (db->wr_fd, oldtotal, newtotal) != 0) /* Try to resize the mapping. Note: no MREMAP_MAYMOVE. */ && mremap (db->head, oldtotal, newtotal, 0) == 0) { |