[systemd-commits] 2 commits - src/journal

[Harald Hoyer]

 src/journal/journal-vacuum.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 489798614cefed16db5f086c3fa9a301f0276fd8
Author: George McCollister <george.mccollister at gmail.com>
Date:   Wed Sep 4 07:12:44 2013 -0500

    journald: fix fd leak in journal_file_empty
    
    Before my previous patch, journal_file_empty wasn't be called with the
    correct filename. Now that it's being called with the correct filename
    it leaks file descriptors. This patch closes the file descriptors before
    returning.
    
    Signed-off-by: George McCollister <george.mccollister at gmail.com>
    
    [Edit harald at redhat.com: make use of _cleanup_close_ instead]

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index ace7722..178c803 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -129,8 +129,9 @@ static void patch_realtime(
 }
 
 static int journal_file_empty(int dir_fd, const char *name) {
-        int fd, r;
+        int r;
         le64_t n_entries;
+        _cleanup_close_ int fd;
 
         fd = openat(dir_fd, name, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK);
         if (fd < 0)

commit 629bfc5a7fbbe4861b5cde857140f623d5de5ec5
Author: George McCollister <george.mccollister at gmail.com>
Date:   Wed Sep 4 07:12:43 2013 -0500

    journald: fix vacuuming of archived journals
    
    d_name is modified on line 227 so if the entire journal name is needed
    again p must be used. Before this change when journal_file_empty was called
    on archived journals it would always return with -2.
    
    Signed-off-by: George McCollister <george.mccollister at gmail.com>

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 79572f1..ace7722 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -265,18 +265,18 @@ int journal_directory_vacuum(
                         /* We do not vacuum active files or unknown files! */
                         continue;
 
-                if (journal_file_empty(dirfd(d), de->d_name)) {
+                if (journal_file_empty(dirfd(d), p)) {
 
                         /* Always vacuum empty non-online files. */
 
-                        if (unlinkat(dirfd(d), de->d_name, 0) >= 0)
-                                log_debug("Deleted empty journal %s/%s.", directory, de->d_name);
+                        if (unlinkat(dirfd(d), p, 0) >= 0)
+                                log_debug("Deleted empty journal %s/%s.", directory, p);
                         else if (errno != ENOENT)
-                                log_warning("Failed to delete %s/%s: %m", directory, de->d_name);
+                                log_warning("Failed to delete %s/%s: %m", directory, p);
                         continue;
                 }
 
-                patch_realtime(directory, de->d_name, &st, &realtime);
+                patch_realtime(directory, p, &st, &realtime);
 
                 GREEDY_REALLOC(list, n_allocated, n_list + 1);