journal: replace linked list by hashmap when merging files

[elogind.git] / src / journal / journald.c

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 9297ca6fb7da390be8877c4b81d6a55308d79fa0..818e146f94aeb30ce0d9384465f5faef4f9ec734 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -257,11 +257,11 @@ static int process_event(Server *s, struct epoll_event *ev) {
 static int open_system_journal(JournalFile **f) {
         int r;
 
-        r = journal_file_open(NULL, "/var/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f);
+        r = journal_file_open("/var/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f);
         if (r == -ENOENT) {
                 mkdir_p("/run/log/journal", 0755);
 
-                r = journal_file_open(NULL, "/run/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f);
+                r = journal_file_open("/run/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f);
         }
 
         return r;