| From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 |
| From: Chen Qi <Qi.Chen@windriver.com> |
| Date: Fri, 1 Mar 2019 15:22:15 +0800 |
| Subject: [PATCH] do not disable buffer in writing files |
| |
| Do not disable buffer in writing files, otherwise we get |
| failure at boot for musl like below. |
| |
| [!!!!!!] Failed to allocate manager object. |
| |
| And there will be other failures, critical or not critical. |
| This is specific to musl. |
| |
| Upstream-Status: Inappropriate [musl] |
| |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| --- |
| src/basic/cgroup-util.c | 14 +++++++------- |
| src/basic/procfs-util.c | 4 ++-- |
| src/basic/smack-util.c | 2 +- |
| src/basic/util.c | 2 +- |
| src/binfmt/binfmt.c | 6 +++--- |
| src/core/main.c | 4 ++-- |
| src/core/smack-setup.c | 8 ++++---- |
| src/hibernate-resume/hibernate-resume.c | 2 +- |
| src/libsystemd/sd-device/sd-device.c | 2 +- |
| src/login/logind-dbus.c | 2 +- |
| src/network/networkd-ipv6-proxy-ndp.c | 2 +- |
| src/network/networkd-link.c | 18 +++++++++--------- |
| src/nspawn/nspawn-cgroup.c | 2 +- |
| src/nspawn/nspawn.c | 6 +++--- |
| src/sleep/sleep.c | 12 ++++++------ |
| src/udev/udevadm-trigger.c | 2 +- |
| src/udev/udevd.c | 6 +++--- |
| src/vconsole/vconsole-setup.c | 2 +- |
| 18 files changed, 48 insertions(+), 48 deletions(-) |
| |
| diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
| index 8ce7ccb..b633226 100644 |
| --- a/src/basic/cgroup-util.c |
| +++ b/src/basic/cgroup-util.c |
| @@ -818,7 +818,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { |
| |
| xsprintf(c, PID_FMT "\n", pid); |
| |
| - r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, c, 0); |
| if (r < 0) |
| return r; |
| |
| @@ -1100,7 +1100,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
| |
| sc = strstrip(contents); |
| if (isempty(sc)) { |
| - r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, agent, 0); |
| if (r < 0) |
| return r; |
| } else if (!path_equal(sc, agent)) |
| @@ -1118,7 +1118,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
| |
| sc = strstrip(contents); |
| if (streq(sc, "0")) { |
| - r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "1", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -1145,7 +1145,7 @@ int cg_uninstall_release_agent(const char *controller) { |
| if (r < 0) |
| return r; |
| |
| - r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "0", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -1155,7 +1155,7 @@ int cg_uninstall_release_agent(const char *controller) { |
| if (r < 0) |
| return r; |
| |
| - r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -2012,7 +2012,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri |
| if (r < 0) |
| return r; |
| |
| - return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(p, value, 0); |
| } |
| |
| int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
| @@ -2660,7 +2660,7 @@ int cg_enable_everywhere( |
| return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); |
| } |
| |
| - r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_stream(f, s, 0); |
| if (r < 0) { |
| log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
| FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
| diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
| index 42ce53d..5751253 100644 |
| --- a/src/basic/procfs-util.c |
| +++ b/src/basic/procfs-util.c |
| @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { |
| * decrease it, as threads-max is the much more relevant sysctl. */ |
| if (limit > pid_max-1) { |
| sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
| - r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0); |
| if (r < 0) |
| return r; |
| } |
| |
| sprintf(buffer, "%" PRIu64, limit); |
| - r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0); |
| if (r < 0) { |
| uint64_t threads_max; |
| |
| diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c |
| index 123d00e..e7ea78f 100644 |
| --- a/src/basic/smack-util.c |
| +++ b/src/basic/smack-util.c |
| @@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { |
| return 0; |
| |
| p = procfs_file_alloca(pid, "attr/current"); |
| - r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, label, 0); |
| if (r < 0) |
| return r; |
| |
| diff --git a/src/basic/util.c b/src/basic/util.c |
| index e577c93..3c64f91 100644 |
| --- a/src/basic/util.c |
| +++ b/src/basic/util.c |
| @@ -631,7 +631,7 @@ void disable_coredumps(void) { |
| if (detect_container() > 0) |
| return; |
| |
| - r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); |
| if (r < 0) |
| log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
| } |
| diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c |
| index af31f09..eec5738 100644 |
| --- a/src/binfmt/binfmt.c |
| +++ b/src/binfmt/binfmt.c |
| @@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { |
| if (!fn) |
| return log_oom(); |
| |
| - return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(fn, "-1", 0); |
| } |
| |
| static int apply_rule(const char *rule) { |
| @@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { |
| |
| (void) delete_rule(rule); |
| |
| - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to add binary format: %m"); |
| |
| @@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { |
| } |
| |
| /* Flush out all rules */ |
| - write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); |
| |
| STRV_FOREACH(f, files) { |
| k = apply_file(*f, true); |
| diff --git a/src/core/main.c b/src/core/main.c |
| index 561f956..db6f113 100644 |
| --- a/src/core/main.c |
| +++ b/src/core/main.c |
| @@ -1468,7 +1468,7 @@ static int bump_unix_max_dgram_qlen(void) { |
| if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) |
| return 0; |
| |
| - r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); |
| + r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); |
| if (r < 0) |
| return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, |
| "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); |
| @@ -1683,7 +1683,7 @@ static void initialize_core_pattern(bool skip_setup) { |
| if (getpid_cached() != 1) |
| return; |
| |
| - r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); |
| } |
| diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c |
| index 49b37ae..c96eedc 100644 |
| --- a/src/core/smack-setup.c |
| +++ b/src/core/smack-setup.c |
| @@ -350,17 +350,17 @@ int mac_smack_setup(bool *loaded_policy) { |
| } |
| |
| #ifdef SMACK_RUN_LABEL |
| - r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m"); |
| - r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m"); |
| r = write_string_file("/sys/fs/smackfs/netlabel", |
| - "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + "0.0.0.0/0 " SMACK_RUN_LABEL, 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m"); |
| - r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
| #endif |
| diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c |
| index 17e7cd1..87a7667 100644 |
| --- a/src/hibernate-resume/hibernate-resume.c |
| +++ b/src/hibernate-resume/hibernate-resume.c |
| @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { |
| return EXIT_FAILURE; |
| } |
| |
| - r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", major_minor, 0); |
| if (r < 0) { |
| log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); |
| return EXIT_FAILURE; |
| diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
| index 2a69f2e..9d55340 100644 |
| --- a/src/libsystemd/sd-device/sd-device.c |
| +++ b/src/libsystemd/sd-device/sd-device.c |
| @@ -1836,7 +1836,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
| if (!value) |
| return -ENOMEM; |
| |
| - r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); |
| + r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); |
| if (r < 0) { |
| if (r == -ELOOP) |
| return -EINVAL; |
| diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c |
| index 8ab498f..d27ef9c 100644 |
| --- a/src/login/logind-dbus.c |
| +++ b/src/login/logind-dbus.c |
| @@ -1231,7 +1231,7 @@ static int trigger_device(Manager *m, sd_device *d) { |
| if (!t) |
| return -ENOMEM; |
| |
| - (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + (void) write_string_file(t, "change", 0); |
| } |
| |
| return 0; |
| diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c |
| index f594b27..c283cc3 100644 |
| --- a/src/network/networkd-ipv6-proxy-ndp.c |
| +++ b/src/network/networkd-ipv6-proxy-ndp.c |
| @@ -43,7 +43,7 @@ static int ipv6_proxy_ndp_set(Link *link) { |
| v = ipv6_proxy_ndp_is_needed(link); |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/proxy_ndp"); |
| |
| - r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m"); |
| |
| diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| index 22392d7..e0ed551 100644 |
| --- a/src/network/networkd-link.c |
| +++ b/src/network/networkd-link.c |
| @@ -274,7 +274,7 @@ static int link_enable_ipv6(Link *link) { |
| |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6"); |
| |
| - r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", |
| enable_disable(!disabled), link->ifname); |
| @@ -1272,7 +1272,7 @@ static int link_set_proxy_arp(Link *link) { |
| |
| p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/proxy_arp"); |
| |
| - r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot configure proxy ARP for interface: %m"); |
| |
| @@ -2541,7 +2541,7 @@ static int link_set_ipv4_forward(Link *link) { |
| * primarily to keep IPv4 and IPv6 packet forwarding behaviour |
| * somewhat in sync (see below). */ |
| |
| - r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot turn on IPv4 packet forwarding, ignoring: %m"); |
| |
| @@ -2563,7 +2563,7 @@ static int link_set_ipv6_forward(Link *link) { |
| * same behaviour there and also propagate the setting from |
| * one to all, to keep things simple (see above). */ |
| |
| - r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m"); |
| |
| @@ -2583,7 +2583,7 @@ static int link_set_ipv6_privacy_extensions(Link *link) { |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/use_tempaddr"); |
| xsprintf(buf, "%u", (unsigned) link->network->ipv6_privacy_extensions); |
| |
| - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot configure IPv6 privacy extension for interface: %m"); |
| |
| @@ -2607,7 +2607,7 @@ static int link_set_ipv6_accept_ra(Link *link) { |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra"); |
| |
| /* We handle router advertisements ourselves, tell the kernel to GTFO */ |
| - r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m"); |
| |
| @@ -2635,7 +2635,7 @@ static int link_set_ipv6_dad_transmits(Link *link) { |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/dad_transmits"); |
| xsprintf(buf, "%i", link->network->ipv6_dad_transmits); |
| |
| - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot set IPv6 dad transmits for interface: %m"); |
| |
| @@ -2663,7 +2663,7 @@ static int link_set_ipv6_hop_limit(Link *link) { |
| p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/hop_limit"); |
| xsprintf(buf, "%i", link->network->ipv6_hop_limit); |
| |
| - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface: %m"); |
| |
| @@ -2689,7 +2689,7 @@ static int link_set_ipv6_mtu(Link *link) { |
| |
| xsprintf(buf, "%" PRIu32, link->network->ipv6_mtu); |
| |
| - r = write_string_file(p, buf, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, buf, 0); |
| if (r < 0) |
| log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m"); |
| |
| diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c |
| index 97fa092..b841f51 100644 |
| --- a/src/nspawn/nspawn-cgroup.c |
| +++ b/src/nspawn/nspawn-cgroup.c |
| @@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { |
| (void) mkdir_parents(fn, 0755); |
| |
| sprintf(pid_string, PID_FMT, pid); |
| - r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fn, pid_string, 0); |
| if (r < 0) { |
| log_error_errno(r, "Failed to move process: %m"); |
| goto finish; |
| diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
| index e0c2d71..213790c 100644 |
| --- a/src/nspawn/nspawn.c |
| +++ b/src/nspawn/nspawn.c |
| @@ -2117,7 +2117,7 @@ static int reset_audit_loginuid(void) { |
| if (streq(p, "4294967295")) |
| return 0; |
| |
| - r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/self/loginuid", "4294967295", 0); |
| if (r < 0) { |
| log_error_errno(r, |
| "Failed to reset audit login UID. This probably means that your kernel is too\n" |
| @@ -3195,13 +3195,13 @@ static int setup_uid_map(pid_t pid) { |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
| xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); |
| - r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, line, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write UID map: %m"); |
| |
| /* We always assign the same UID and GID ranges */ |
| xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
| - r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, line, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write GID map: %m"); |
| |
| diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
| index 5b7984a..bf818aa 100644 |
| --- a/src/sleep/sleep.c |
| +++ b/src/sleep/sleep.c |
| @@ -43,7 +43,7 @@ static int write_hibernate_location_info(void) { |
| |
| /* if it's a swap partition, we just write the disk to /sys/power/resume */ |
| if (streq(type, "partition")) { |
| - r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", device, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); |
| |
| @@ -79,12 +79,12 @@ static int write_hibernate_location_info(void) { |
| |
| offset = fiemap->fm_extents[0].fe_physical / page_size(); |
| xsprintf(offset_str, "%" PRIu64, offset); |
| - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume_offset", offset_str, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); |
| |
| xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); |
| - r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", device_str, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Failed to write device '%s': %m", device_str); |
| |
| @@ -98,7 +98,7 @@ static int write_mode(char **modes) { |
| STRV_FOREACH(mode, modes) { |
| int k; |
| |
| - k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + k = write_string_file("/sys/power/disk", *mode, 0); |
| if (k >= 0) |
| return 0; |
| |
| @@ -117,7 +117,7 @@ static int write_state(FILE **f, char **states) { |
| STRV_FOREACH(state, states) { |
| int k; |
| |
| - k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + k = write_string_stream(*f, *state, 0); |
| if (k >= 0) |
| return 0; |
| log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); |
| @@ -212,7 +212,7 @@ static int rtc_write_wake_alarm(uint64_t sec) { |
| |
| xsprintf(buf, "%" PRIu64, sec); |
| |
| - r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf); |
| |
| diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c |
| index 9532946..2e576bb 100644 |
| --- a/src/udev/udevadm-trigger.c |
| +++ b/src/udev/udevadm-trigger.c |
| @@ -42,7 +42,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se |
| if (!filename) |
| return log_oom(); |
| |
| - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(filename, action, 0); |
| if (r < 0) { |
| log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); |
| continue; |
| diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
| index 0303f36..687d009 100644 |
| --- a/src/udev/udevd.c |
| +++ b/src/udev/udevd.c |
| @@ -1218,7 +1218,7 @@ static int synthesize_change(sd_device *dev) { |
| */ |
| log_debug("Device '%s' is closed, synthesising 'change'", devname); |
| strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); |
| - write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + write_string_file(filename, "change", 0); |
| |
| FOREACH_DEVICE(e, d) { |
| const char *t, *n, *s; |
| @@ -1233,7 +1233,7 @@ static int synthesize_change(sd_device *dev) { |
| |
| log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n); |
| strscpyl(filename, sizeof(filename), s, "/uevent", NULL); |
| - write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + write_string_file(filename, "change", 0); |
| } |
| |
| return 0; |
| @@ -1241,7 +1241,7 @@ static int synthesize_change(sd_device *dev) { |
| |
| log_debug("Device %s is closed, synthesising 'change'", devname); |
| strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); |
| - write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + write_string_file(filename, "change", 0); |
| |
| return 0; |
| } |
| diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
| index ebdeba3..aa879e6 100644 |
| --- a/src/vconsole/vconsole-setup.c |
| +++ b/src/vconsole/vconsole-setup.c |
| @@ -114,7 +114,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { |
| static int toggle_utf8_sysfs(bool utf8) { |
| int r; |
| |
| - r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); |
| if (r < 0) |
| return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
| |
| -- |
| 2.7.4 |
| |