picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #983 from phomes/journal_dead_check

Browse source 
journal: remove error check that never happens
This commit is contained in:
Lennart Poettering 2015-08-18 10:16:10 +02:00
parent d2b5f6bdbb b2b46f91db
commit 73d4f46a77
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/journal/sd-journal.c
View file

@ -1489,7 +1489,7 @@ static int add_root_directory(sd_journal *j, const char *p) {
return 0;
}
static int remove_directory(sd_journal *j, Directory *d) {
static void remove_directory(sd_journal *j, Directory *d) {
assert(j);
if (d->wd > 0) {
@ -1508,8 +1508,6 @@ static int remove_directory(sd_journal *j, Directory *d) {
free(d->path);
free(d);
return 0;
}
static int add_search_paths(sd_journal *j) {
@ -2147,12 +2145,8 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
/* Event for a subdirectory */
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
r = remove_directory(j, d);
if (r < 0)
log_debug_errno(r, "Failed to remove directory %s: %m", d->path);
}
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT))
remove_directory(j, d);
} else if (d->is_root && (e->mask & IN_ISDIR) && e->len > 0 && sd_id128_from_string(e->name, &id) >= 0) {