sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

systemd: Fix journal "Failed to set file attributes:" warning 

This is a backport of an upstream patch that fixes the
"Failed to set file attributes: Inappropriate ioctl for device" message
when the device exists on ext4 filesystems.

No functionality is changed, the patch just removes a potentially misleading
warning.

(From OE-Core rev: 18304e03c8ab8de94b6001a8a5677b57862da0f4)

Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Randy Witt 2015-03-06 14:15:33 -08:00 committed by Richard Purdie
parent 85532e020e
commit da8a15a7d6
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch Normal file
View File

@ -0,0 +1,37 @@
From 65eae3b76243d2dfd869f8c43b787575f7b4b994 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.]
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
---
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 9c9a548..0e33a0f 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
--
1.9.3

1
meta/recipes-core/systemd/systemd_219.bb
View File

@ -43,6 +43,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
file://0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch \
file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \
file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \
file://tmpfiles-pam.patch \
file://touchscreen.rules \
file://00-create-volatile.conf \