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