summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-03-06 14:15:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:42:08 +0000
commitda8a15a7d6aba0dbbea15229ee3118644d0d6e34 (patch)
treefdb2af31addbfec92b4af171df87f87b239a7e30
parent85532e020eae089dffdd67e99eb602fb3424c5ca (diff)
downloadpoky-da8a15a7d6aba0dbbea15229ee3118644d0d6e34.tar.gz
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>
-rw-r--r--meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch37
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
new file mode 100644
index 0000000000..a49d626824
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
@@ -0,0 +1,37 @@
1From 65eae3b76243d2dfd869f8c43b787575f7b4b994 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
3Date: Sun, 1 Mar 2015 21:13:10 -0300
4Subject: [PATCH] journal: fix Inappropriate ioctl for device on ext4
5
6Logs constantly show
7
8systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device
9
10This is because ext4 does not support FS_NOCOW_FL.
11
12[zj: fold into one conditional as suggested on the ML and
13 fix (preexisting) r/errno confusion in error message.]
14
15Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
16---
17 src/journal/journal-file.c | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
21index 9c9a548..0e33a0f 100644
22--- a/src/journal/journal-file.c
23+++ b/src/journal/journal-file.c
24@@ -2609,8 +2609,8 @@ int journal_file_open(
25 * shouldn't be too bad, given that we do our own
26 * checksumming). */
27 r = chattr_fd(f->fd, true, FS_NOCOW_FL);
28- if (r < 0)
29- log_warning_errno(errno, "Failed to set file attributes: %m");
30+ if (r < 0 && r != -ENOTTY)
31+ log_warning_errno(r, "Failed to set file attributes: %m");
32
33 /* Let's attach the creation time to the journal file,
34 * so that the vacuuming code knows the age of this
35--
361.9.3
37
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index d5eed08f1f..238ee6707b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -43,6 +43,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
43 file://0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch \ 43 file://0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch \
44 file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \ 44 file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \
45 file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ 45 file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
46 file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \
46 file://tmpfiles-pam.patch \ 47 file://tmpfiles-pam.patch \
47 file://touchscreen.rules \ 48 file://touchscreen.rules \
48 file://00-create-volatile.conf \ 49 file://00-create-volatile.conf \