From 983c520982b548c9bb8f2689a93f2fb35c54c392 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>

Date: Sun, 1 Mar 2015 21:13:10 -0300

Subject: [PATCH] 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.]

(cherry picked from commit 65eae3b76243d2dfd869f8c43b787575f7b4b994)

---

 src/journal/journal-file.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c

index 2845e05ce0..0f28718b0e 100644

--- a/src/journal/journal-file.c

+++ b/src/journal/journal-file.c

@@ -2611,8 +2611,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