dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 09:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

journald: fix vacuuming of archived journals

Browse Source 
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@gmail.com>
This commit is contained in:
George McCollister
2013-09-04 07:12:43 -05:00
committed by Harald Hoyer
parent 756c9a2499
commit 629bfc5a7f
Notes: Lennart Poettering 2013-10-04 17:11:46 +02:00 
Backport: bugfix
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/journal-vacuum.c
View File

@@ -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);