[systemd-commits] 2 commits - src/journal src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/journal/journald-server.c |    7 +++----
 src/shared/missing.h          |    3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 28f30cf274398ab80c71ea0c2afec4b94f8ba76e
Author: Chengwei Yang <chengwei.yang at intel.com>
Date:   Tue May 14 09:03:04 2013 +0800

    Fix syscall(__NR_fanotify_mark, ...) on arm

diff --git a/src/shared/missing.h b/src/shared/missing.h
index d4ba0d3..96e6d63 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -138,7 +138,8 @@ static inline int fanotify_init(unsigned int flags, unsigned int event_f_flags)
 #ifndef HAVE_FANOTIFY_MARK
 static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
                                 int dfd, const char *pathname) {
-#if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__
+#if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \
+	|| defined __arm__ && !defined __aarch64__
         union {
                 uint64_t _64;
                 uint32_t _32[2];

commit ca2670162464b98f44d3f30a1d8b47b02609784c
Author: Michał Bartoszkiewicz <mbartoszkiewicz at gmail.com>
Date:   Wed May 15 11:28:58 2013 +0200

    journal: correctly convert usec_t to timespec.
    
    Use timespec_store instead of (incorrectly) doing it inline.

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index cc52b8a..b717b92 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1332,10 +1332,9 @@ int server_schedule_sync(Server *s) {
                 return 0;
 
         if (s->sync_interval_usec) {
-                struct itimerspec sync_timer_enable = {
-                        .it_value.tv_sec = s->sync_interval_usec / USEC_PER_SEC,
-                        .it_value.tv_nsec = s->sync_interval_usec % MSEC_PER_SEC,
-                };
+                struct itimerspec sync_timer_enable = {};
+
+                timespec_store(&sync_timer_enable.it_value, s->sync_interval_usec);
 
                 r = timerfd_settime(s->sync_timer_fd, 0, &sync_timer_enable, NULL);
                 if (r < 0)