From: Cristian Rodríguez <crrodriguez@opensuse.org>
Date: Mon, 2 Mar 2015 00:13:10 +0000 (-0300)
Subject: journal: fix Inappropriate ioctl for device on ext4
X-Git-Tag: v219.0~526
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=65eae3b76243d2dfd869f8c43b787575f7b4b994;hp=09d801a82a46df518dd752e40bf13ac404daa2ce

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.]
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 9c9a5483b..0e33a0fd8 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