chiark / gitweb /
udev: check return value of write
[elogind.git] / src / journal / journal-vacuum.c
index ff2cd3306d0a2bf993c7ded366815aee002cf73f..ac16bdfcfd4890fbe603ebe38d572ec9ca4ba03c 100644 (file)
@@ -86,7 +86,8 @@ int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t m
 
         for (;;) {
                 int k;
-                struct dirent buf, *de;
+                struct dirent *de;
+                union dirent_storage buf;
                 size_t q;
                 struct stat st;
                 char *p;
@@ -94,7 +95,7 @@ int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t m
                 sd_id128_t seqnum_id;
                 bool have_seqnum;
 
-                k = readdir_r(d, &buf, &de);
+                k = readdir_r(d, &buf.de, &de);
                 if (k != 0) {
                         r = -k;
                         goto finish;
@@ -211,7 +212,7 @@ int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t m
                         break;
 
                 if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
-                        log_info("Deleted archived journal %s/%s.", directory, list[i].filename);
+                        log_debug("Deleted archived journal %s/%s.", directory, list[i].filename);
                         sum -= list[i].usage;
                 } else if (errno != ENOENT)
                         log_warning("Failed to delete %s/%s: %m", directory, list[i].filename);