Le mercredi 29 février 2012 à 13:54 +0100, Frederic Crozat a écrit : > Le mercredi 29 février 2012 à 12:45 +0100, Dirk Eibach a écrit : > > --- > > src/journal/journal-file.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c > > index 20ca3f6..275caea 100644 > > --- a/src/journal/journal-file.c > > +++ b/src/journal/journal-file.c > > @@ -238,7 +238,7 @@ static int journal_file_allocate(JournalFile *f, > > uint64_t offset, uint64_t size) > > if (fstat(f->fd, &f->last_stat) < 0) > > return -errno; > > > > - f->header->arena_size = new_size - > > htole64(f->header->arena_offset); > > + f->header->arena_size = htole64(new_size - > > le64toh(f->header->arena_offset)); > > > > return 0; > > } > > I confirm this patch fixes journald not starting properly on ppc > architecture (got the report yesterday from folks in the office). > > But it looks like systemd-journalctl is still broken on this arch.
So far, I think I found two different endianess errors in the code, but more are pending, since I'm getting assertion when trying to access a journal file created on x86 architecture, on a powerpc system (and now, I get similar errors with journal created on ppc, so maybe only the writing code need fixing ;). Please review my current patch carefully, I'm not 100% sure my fix are accurate (this part of journald is a bit tricky to get right ;) -- Frederic Crozat <[email protected]> SUSE
>From 440c1612ff63932435b23e9ea99ba23f12d0d851 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <[email protected]> Date: Thu, 1 Mar 2012 18:00:01 +0100 Subject: [PATCH] journal: fix endianness error --- src/journal/journal-file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 275caea..fd8f23d 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -833,7 +833,7 @@ static int link_entry_into_array(JournalFile *f, o->entry_array.items[i] = htole64(p); if (ap == 0) - *first = q; + *first = htole64(q); else { r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, ap, &o); if (r < 0) @@ -866,7 +866,7 @@ static int link_entry_into_array_plus_one(JournalFile *f, else { uint64_t i; - i = le64toh(*idx) - 1; + i = htole64(le64toh(*idx) - 1); r = link_entry_into_array(f, first, &i, p); if (r < 0) return r; -- 1.7.7
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
