Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj Index: systemd-208/src/journal/journal-file.c =================================================================== --- systemd-208.orig/src/journal/journal-file.c 2014-02-14 00:05:05.000000000 -0800 +++ systemd-208/src/journal/journal-file.c 2014-02-14 00:08:41.338821677 -0800 @@ -38,6 +38,8 @@ #include "compress.h" #include "fsprg.h" +#include "config.h" + #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) @@ -316,7 +318,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { uint64_t old_size, new_size, file_size; - int r; + int r = 0; assert(f); @@ -359,9 +361,24 @@ /* Note that the glibc fallocate() fallback is very inefficient, hence we try to minimize the allocation area as we can. */ +#ifdef HAVE_POSIX_ALLOCATE r = posix_fallocate(f->fd, old_size, new_size - old_size); if (r != 0) return -r; +#else + /* Use good old method to write zeros into the journal file + perhaps very inefficient yet working. */ + if(new_size > old_size) { + char *buf = alloca(new_size - old_size); + off_t oldpos = lseek(f->fd, 0, SEEK_CUR); + bzero(buf, new_size - old_size); + lseek(f->fd, old_size, SEEK_SET); + r = write(f->fd, buf, new_size - old_size); + lseek(f->fd, oldpos, SEEK_SET); + } + if (r < 0) + return -errno; +#endif /* HAVE_POSIX_FALLOCATE */ /* Increase the file size a bit further than this, so that we * we can create larger memory maps to cache */ Index: systemd-208/src/journal/journald-kmsg.c =================================================================== --- systemd-208.orig/src/journal/journald-kmsg.c 2014-02-14 00:05:05.000000000 -0800 +++ systemd-208/src/journal/journald-kmsg.c 2014-02-14 00:05:47.498823000 -0800 @@ -407,6 +407,7 @@ int server_open_kernel_seqnum(Server *s) { int fd; + int r = 0; uint64_t *p; assert(s); @@ -420,8 +421,19 @@ log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); return 0; } - - if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { +#ifdef HAVE_POSIX_ALLOCATE + r = posix_fallocate(fd, 0, sizeof(uint64_t)); +#else + /* Use good old method to write zeros into the journal file + perhaps very inefficient yet working. */ + char *buf = alloca(sizeof(uint64_t)); + off_t oldpos = lseek(fd, 0, SEEK_CUR); + bzero(buf, sizeof(uint64_t)); + lseek(fd, 0, SEEK_SET); + r = write(fd, buf, sizeof(uint64_t)); + lseek(fd, oldpos, SEEK_SET); +#endif /* HAVE_POSIX_FALLOCATE */ + if (r < 0) { log_error("Failed to allocate sequential number file, ignoring: %m"); close_nointr_nofail(fd); return 0;