summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Rodríguez <crrodriguez@opensuse.org>2015-03-01 21:13:10 -0300
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-03-02 10:54:19 -0500
commit65eae3b76243d2dfd869f8c43b787575f7b4b994 (patch)
treeb24dedebccab504c0b6f04bd29b32809b7e392bc
parent09d801a82a46df518dd752e40bf13ac404daa2ce (diff)
journal: fix Inappropriate ioctl for device on ext4
Logs constantly show systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device This is because ext4 does not support FS_NOCOW_FL. [zj: fold into one conditional as suggested on the ML and fix (preexisting) r/errno confusion in error message.]
-rw-r--r--src/journal/journal-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 9c9a5483be..0e33a0fd87 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2609,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