diff options
author | Cristian RodrÃguez <crrodriguez@opensuse.org> | 2015-03-01 21:13:10 -0300 |
---|---|---|
committer | Maciej Wereski <m.wereski@partner.samsung.com> | 2015-06-26 15:06:43 +0200 |
commit | 5d165975678866b57f08004b4fd78db0251bfb0f (patch) | |
tree | dc368670be0e9979c778677bf221a79aa9e2e276 | |
parent | a4f48778420bc73b6ec5ed1970d0fdc2d2a9bed5 (diff) | |
download | systemd-5d165975678866b57f08004b4fd78db0251bfb0f.tar.gz systemd-5d165975678866b57f08004b4fd78db0251bfb0f.tar.bz2 systemd-5d165975678866b57f08004b4fd78db0251bfb0f.zip |
journal: fix Inappropriate ioctl for device on ext4submit/tizen_tv/20150629.104509submit/tizen_mobile/20150629.104608submit/tizen_common/20150629.103756submit/tizen_3.0.2015.q2_common/20150630.075923submit/submit/tizen_tv/20150629.104509/20150629.104552accepted/tizen/tv/20150630.080634accepted/tizen/mobile/20150630.080622accepted/tizen/common/20150630.075903accepted/tizen/3.0.2015.q2/common/20150630.092734accepted/tizen_3.0.2015.q2_common
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.]
Change-Id: I6bac59d20605235d2236f8ab8f024d8998d0e928
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
-rw-r--r-- | src/journal/journal-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 2845e05ce0..0f28718b0e 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2611,8 +2611,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 |