projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ecc1709
)
tmpfiles: in dir_cleanup() take benefit that log_error_errno() returns the error...
author
Lennart Poettering
<lennart@poettering.net>
Mon, 22 Jan 2018 14:31:01 +0000
(15:31 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 22 Jan 2018 14:31:24 +0000
(15:31 +0100)
src/tmpfiles/tmpfiles.c
patch
|
blob
|
history
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index
66dabc7
..
128abb8
100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-652,10
+652,8
@@
static int dir_cleanup(
log_debug("Removing directory \"%s\".", sub_path);
if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0)
- if (!IN_SET(errno, ENOENT, ENOTEMPTY)) {
- log_error_errno(errno, "rmdir(%s): %m", sub_path);
- r = -errno;
- }
+ if (!IN_SET(errno, ENOENT, ENOTEMPTY))
+ r = log_error_errno(errno, "rmdir(%s): %m", sub_path);
} else {
/* Skip files for which the sticky bit is