You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.7 KiB
42 lines
1.7 KiB
From 7fe6194a2a7872532f121e6159d4fa60d1c85c50 Mon Sep 17 00:00:00 2001 |
|
From: =?UTF-8?q?Michal=20Sekleta=CC=81r?= <msekleta@redhat.com> |
|
Date: Fri, 27 Mar 2020 17:01:59 +0100 |
|
Subject: [PATCH] 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 |
|
|
|
(cherry-picked from commit 8581b9f9732d4c158bb5f773230a65ce77f2c292) |
|
|
|
Resolves: #1812889 |
|
--- |
|
src/journal/sd-journal.c | 7 +++---- |
|
1 file changed, 3 insertions(+), 4 deletions(-) |
|
|
|
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c |
|
index 09466df810..1f03c8e8ba 100644 |
|
--- a/src/journal/sd-journal.c |
|
+++ b/src/journal/sd-journal.c |
|
@@ -2399,13 +2399,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_error("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
|
|
|