chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: fix vacuuming of archived journals
[elogind.git]
/
src
/
journal
/
journal-vacuum.c
diff --git
a/src/journal/journal-vacuum.c
b/src/journal/journal-vacuum.c
index 79572f1fb6df556e25d09075afa5b5b265757462..ace772273b6bedc250c953eb8698194fb4375658 100644
(file)
--- 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;
/* 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. */
/* 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)
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;
}
continue;
}
- patch_realtime(directory,
de->d_name
, &st, &realtime);
+ patch_realtime(directory,
p
, &st, &realtime);
GREEDY_REALLOC(list, n_allocated, n_list + 1);
GREEDY_REALLOC(list, n_allocated, n_list + 1);