diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index a49d626824..0000000000 --- a/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 65eae3b76243d2dfd869f8c43b787575f7b4b994 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org> | ||
3 | Date: Sun, 1 Mar 2015 21:13:10 -0300 | ||
4 | Subject: [PATCH] journal: fix Inappropriate ioctl for device on ext4 | ||
5 | |||
6 | Logs constantly show | ||
7 | |||
8 | systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device | ||
9 | |||
10 | This 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 | |||
15 | Signed-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 | |||
20 | diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c | ||
21 | index 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 | -- | ||
36 | 1.9.3 | ||
37 | |||