Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj Index: git/src/journal/journal-file.c =================================================================== --- git.orig/src/journal/journal-file.c 2014-04-22 22:53:05.000000000 -0700 +++ git/src/journal/journal-file.c 2014-04-22 22:53:51.130236707 -0700 @@ -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)) @@ -314,7 +316,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { uint64_t old_size, new_size; - int r; + int r = 0; assert(f); @@ -362,9 +364,24 @@ /* Note that the glibc fallocate() fallback is very inefficient, hence we try to minimize the allocation area as we can. */ +#ifdef HAVE_POSIX_FALLOCATE 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 */ if (fstat(f->fd, &f->last_stat) < 0) return -errno; Index: git/src/journal/journald-kmsg.c =================================================================== --- git.orig/src/journal/journald-kmsg.c 2014-04-22 22:53:05.000000000 -0700 +++ git/src/journal/journald-kmsg.c 2014-04-22 22:54:27.830236809 -0700 @@ -437,6 +437,7 @@ int server_open_kernel_seqnum(Server *s) { _cleanup_close_ int fd; uint64_t *p; + int r = 0; assert(s); @@ -449,8 +450,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_FALLOCATE + 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"); return 0; }