X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.c;h=0e33a0fd873e7562a640d50246bb0c9e9e169603;hb=b6e676ce41508e2aeea22202fc8f234126177f52;hp=9b4967fb3216b739bde0a9ab6b9c5984885716eb;hpb=2eec67acbb00593e414549a7e5b35eb7dd776b1b;p=elogind.git diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 9b4967fb3..0e33a0fd8 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2013,8 +2013,7 @@ void journal_file_reset_location(JournalFile *f) { f->current_xor_hash = 0; } -void journal_file_save_location(JournalFile *f, direction_t direction, Object *o, uint64_t offset) { - f->last_direction = direction; +void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset) { f->location_type = LOCATION_SEEK; f->current_offset = offset; f->current_seqnum = le64toh(o->entry.seqnum); @@ -2610,8 +2609,8 @@ int journal_file_open( * shouldn't be too bad, given that we do our own * checksumming). */ r = chattr_fd(f->fd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes: %m"); + if (r < 0 && r != -ENOTTY) + log_warning_errno(r, "Failed to set file attributes: %m"); /* Let's attach the creation time to the journal file, * so that the vacuuming code knows the age of this