commit 1ed8f8c16da99551c6731764759878a0bc243fde
author Lennart Poettering <lennart@poettering.net> Wed Apr 08 20:47:35 2015 +0200
committer Lennart Poettering <lennart@poettering.net> Wed Apr 08 20:47:35 2015 +0200
tree e374c9701d1f6217e77b056b52401c02d59755eb
parent 171181bcd64d5a128f6678107d18ffa1c9388b94

util: merge change_attr_fd() and chattr_fd()

src/tmpfiles/tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 8c89fb3..16ed100 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -869,14 +869,13 @@
         }
 
         fd = open(path, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
-
         if (fd < 0)
                 return log_error_errno(errno, "Cannot open \"%s\": %m", path);
 
         f = item->attrib_value & item->attrib_mask;
         if (!S_ISDIR(st.st_mode))
                 f &= ~FS_DIRSYNC_FL;
-        r = change_attr_fd(fd, f, item->attrib_mask);
+        r = chattr_fd(fd, f, item->attrib_mask);
         if (r < 0)
                 return log_error_errno(errno,
                         "Cannot set attrib for \"%s\", value=0x%08lx, mask=0x%08lx: %m",