diff options
| author |   Randy Witt <randy.e.witt@linux.intel.com> | 2015-03-06 14:15:33 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-16 17:38:50 +0000 |
| commit | 18304e03c8ab8de94b6001a8a5677b57862da0f4 (patch) | |
| tree | 61ee16b619dd13f2f6ad96ef8290aff4a79e5c29 /meta/recipes-core/systemd/systemd | |
| parent | b4c7921001a30e0162cacbe12b1a5b888b36db57 (diff) | |
| download | openembedded-core-18304e03c8ab8de94b6001a8a5677b57862da0f4.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.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch | 37 |
1 files changed, 37 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 @@ +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 + |