daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From b3df4af4258e3285704f9622b9655084439c6f5e Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
803fb7
Date: Sun, 1 Mar 2015 21:13:10 -0300
803fb7
Subject: [PATCH] journal: fix Inappropriate ioctl for device on ext4
803fb7
803fb7
Logs constantly show
803fb7
803fb7
systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device
803fb7
803fb7
This is because ext4 does not support FS_NOCOW_FL.
803fb7
803fb7
[zj: fold into one conditional as suggested on the ML and
803fb7
     fix (preexisting) r/errno confusion in error message.]
803fb7
803fb7
(cherry picked from commit 65eae3b76243d2dfd869f8c43b787575f7b4b994)
803fb7
---
803fb7
 src/journal/journal-file.c | 4 ++--
803fb7
 1 file changed, 2 insertions(+), 2 deletions(-)
803fb7
803fb7
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
803fb7
index 2845e05ce..0f28718b0 100644
803fb7
--- a/src/journal/journal-file.c
803fb7
+++ b/src/journal/journal-file.c
803fb7
@@ -2611,8 +2611,8 @@ int journal_file_open(
803fb7
                  * shouldn't be too bad, given that we do our own
803fb7
                  * checksumming). */
803fb7
                 r = chattr_fd(f->fd, true, FS_NOCOW_FL);
803fb7
-                if (r < 0)
803fb7
-                        log_warning_errno(errno, "Failed to set file attributes: %m");
803fb7
+                if (r < 0 && r != -ENOTTY)
803fb7
+                        log_warning_errno(r, "Failed to set file attributes: %m");
803fb7
 
803fb7
                 /* Let's attach the creation time to the journal file,
803fb7
                  * so that the vacuuming code knows the age of this