mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
sd-journal: remove the dead code and actually fix #14695
journal_file_fstat() returns an error if we call it on already unlinked journal file and hence we never reach remove_file_real() which is the entire point. I must have made some mistake while testing the fix that got me thinking the issue is gone while opposite was true. Fixes #14695
This commit is contained in:
parent
2df0df56dd
commit
8581b9f973
@ -2675,13 +2675,12 @@ _public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {
|
||||
Get rid of the deleted files now so they don't stay around indefinitely. */
|
||||
ORDERED_HASHMAP_FOREACH(f, j->files, i) {
|
||||
r = journal_file_fstat(f);
|
||||
if (r < 0) {
|
||||
if (r == -EIDRM)
|
||||
remove_file_real(j, f);
|
||||
else if (r < 0) {
|
||||
log_debug_errno(r,"Failed to fstat() journal file '%s' : %m", f->path);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (f->last_stat.st_nlink <= 0)
|
||||
remove_file_real(j, f);
|
||||
}
|
||||
|
||||
/* The journal might have changed since the context
|
||||
|
Loading…
Reference in New Issue
Block a user