| From 414e2f97008a1f3c26a260a6dc4d51a8c1fa6900 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> |
| [Rebased for v242] |
| Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
| [rebased for systemd 243] |
| Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
| |
| --- |
| src/basic/cgroup-util.c | 12 ++++++------ |
| src/basic/namespace-util.c | 4 ++-- |
| src/basic/procfs-util.c | 4 ++-- |
| src/basic/sysctl-util.c | 2 +- |
| src/basic/util.c | 2 +- |
| src/binfmt/binfmt.c | 6 +++--- |
| src/core/cgroup.c | 2 +- |
| src/core/main.c | 4 ++-- |
| src/core/smack-setup.c | 8 ++++---- |
| src/hibernate-resume/hibernate-resume.c | 2 +- |
| src/home/homework.c | 2 +- |
| src/libsystemd/sd-device/sd-device.c | 2 +- |
| src/nspawn/nspawn-cgroup.c | 2 +- |
| src/nspawn/nspawn.c | 6 +++--- |
| src/shared/binfmt-util.c | 2 +- |
| src/shared/cgroup-setup.c | 4 ++-- |
| src/shared/coredump-util.c | 2 +- |
| src/shared/smack-util.c | 2 +- |
| src/sleep/sleep.c | 8 ++++---- |
| src/udev/udev-rules.c | 1 - |
| src/vconsole/vconsole-setup.c | 2 +- |
| 21 files changed, 39 insertions(+), 40 deletions(-) |
| |
| diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
| index f4615ffce1..07cb8ed669 100644 |
| --- a/src/basic/cgroup-util.c |
| +++ b/src/basic/cgroup-util.c |
| @@ -399,7 +399,7 @@ int cg_kill_kernel_sigkill(const char *controller, const char *path) { |
| if (r < 0) |
| return r; |
| |
| - r = write_string_file(killfile, "1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(killfile, "1", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -805,7 +805,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)) |
| @@ -823,7 +823,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; |
| |
| @@ -850,7 +850,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; |
| |
| @@ -860,7 +860,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; |
| |
| @@ -1730,7 +1730,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) { |
| diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c |
| index b9120a5ed0..78e460b75f 100644 |
| --- a/src/basic/namespace-util.c |
| +++ b/src/basic/namespace-util.c |
| @@ -202,12 +202,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { |
| freeze(); |
| |
| xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); |
| - r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(path, uid_map, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write UID map: %m"); |
| |
| xsprintf(path, "/proc/" PID_FMT "/gid_map", pid); |
| - r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(path, gid_map, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write GID map: %m"); |
| |
| diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
| index e485a0196b..8bff210356 100644 |
| --- a/src/basic/procfs-util.c |
| +++ b/src/basic/procfs-util.c |
| @@ -64,13 +64,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/sysctl-util.c b/src/basic/sysctl-util.c |
| index b66a6622ae..8d1c93008a 100644 |
| --- a/src/basic/sysctl-util.c |
| +++ b/src/basic/sysctl-util.c |
| @@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { |
| |
| log_debug("Setting '%s' to '%s'", p, value); |
| |
| - return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL); |
| + return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL); |
| } |
| |
| int sysctl_writef(const char *property, const char *format, ...) { |
| diff --git a/src/basic/util.c b/src/basic/util.c |
| index d7ef382737..31c35118d1 100644 |
| --- a/src/basic/util.c |
| +++ b/src/basic/util.c |
| @@ -168,7 +168,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 18231c2618..6c598d55c8 100644 |
| --- a/src/binfmt/binfmt.c |
| +++ b/src/binfmt/binfmt.c |
| @@ -29,7 +29,7 @@ static bool arg_unregister = false; |
| |
| static int delete_rule(const char *rulename) { |
| const char *fn = strjoina("/proc/sys/fs/binfmt_misc/", rulename); |
| - return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(fn, "-1", 0); |
| } |
| |
| static int apply_rule(const char *filename, unsigned line, const char *rule) { |
| @@ -59,7 +59,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) { |
| if (r >= 0) |
| log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); |
| |
| - 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, "%s:%u: Failed to add binary format '%s': %m", |
| filename, line, rulename); |
| @@ -225,7 +225,7 @@ static int run(int argc, char *argv[]) { |
| } |
| |
| /* Flush out all rules */ |
| - r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); |
| else |
| diff --git a/src/core/cgroup.c b/src/core/cgroup.c |
| index 9282b1ff20..7781e0f8eb 100644 |
| --- a/src/core/cgroup.c |
| +++ b/src/core/cgroup.c |
| @@ -4182,7 +4182,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { |
| else |
| u->freezer_state = FREEZER_THAWING; |
| |
| - r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0); |
| if (r < 0) |
| return r; |
| |
| diff --git a/src/core/main.c b/src/core/main.c |
| index 409b84a006..b1631e57ce 100644 |
| --- a/src/core/main.c |
| +++ b/src/core/main.c |
| @@ -1374,7 +1374,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, |
| + 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, |
| @@ -1646,7 +1646,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 f88cb80834..68055fb64a 100644 |
| --- a/src/core/smack-setup.c |
| +++ b/src/core/smack-setup.c |
| @@ -320,17 +320,17 @@ int mac_smack_setup(bool *loaded_policy) { |
| } |
| |
| #if HAVE_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 1c7d9179d8..3ae78ee580 100644 |
| --- a/src/hibernate-resume/hibernate-resume.c |
| +++ b/src/hibernate-resume/hibernate-resume.c |
| @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { |
| return EXIT_FAILURE; |
| } |
| |
| - r = write_string_file("/sys/power/resume", FORMAT_DEVNUM(st.st_rdev), WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", FORMAT_DEVNUM(st.st_rdev), 0); |
| if (r < 0) { |
| log_error_errno(r, "Failed to write '" DEVNUM_FORMAT_STR "' to /sys/power/resume: %m", DEVNUM_FORMAT_VAL(st.st_rdev)); |
| return EXIT_FAILURE; |
| diff --git a/src/home/homework.c b/src/home/homework.c |
| index 0014a7f598..ec3e9caa1c 100644 |
| --- a/src/home/homework.c |
| +++ b/src/home/homework.c |
| @@ -278,7 +278,7 @@ static void drop_caches_now(void) { |
| * details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but not |
| * more. */ |
| |
| - r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0); |
| if (r < 0) |
| log_warning_errno(r, "Failed to drop caches, ignoring: %m"); |
| else |
| diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
| index aaf951ced8..45a9d70f0d 100644 |
| --- a/src/libsystemd/sd-device/sd-device.c |
| +++ b/src/libsystemd/sd-device/sd-device.c |
| @@ -2215,7 +2215,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) { |
| /* On failure, clear cache entry, as we do not know how it fails. */ |
| device_remove_cached_sysattr_value(device, sysattr); |
| diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c |
| index 9e6379ae7b..546a03a7f5 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) { |
| fn = strjoina(tree, cgroup, "/cgroup.procs"); |
| |
| sprintf(pid_string, PID_FMT, pid); |
| - r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); |
| + r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755); |
| 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 c5fd978395..fefe8a21e5 100644 |
| --- a/src/nspawn/nspawn.c |
| +++ b/src/nspawn/nspawn.c |
| @@ -2759,7 +2759,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" |
| @@ -4187,7 +4187,7 @@ static int setup_uid_map( |
| return log_oom(); |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
| - r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, s, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write UID map: %m"); |
| |
| @@ -4197,7 +4197,7 @@ static int setup_uid_map( |
| return log_oom(); |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
| - r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, s, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write GID map: %m"); |
| |
| diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c |
| index 724d7f27d9..dd725cff92 100644 |
| --- a/src/shared/binfmt-util.c |
| +++ b/src/shared/binfmt-util.c |
| @@ -26,7 +26,7 @@ int disable_binfmt(void) { |
| if (r < 0) |
| return log_warning_errno(r, "Failed to determine whether binfmt_misc is mounted: %m"); |
| |
| - r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); |
| if (r < 0) |
| return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); |
| |
| diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c |
| index a1fabc73c1..c5c8fc417e 100644 |
| --- a/src/shared/cgroup-setup.c |
| +++ b/src/shared/cgroup-setup.c |
| @@ -344,7 +344,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 == -EOPNOTSUPP && cg_is_threaded(controller, path) > 0) |
| /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */ |
| return -EUCLEAN; |
| @@ -879,7 +879,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/shared/coredump-util.c b/src/shared/coredump-util.c |
| index a0b648bf79..13f921390d 100644 |
| --- a/src/shared/coredump-util.c |
| +++ b/src/shared/coredump-util.c |
| @@ -70,5 +70,5 @@ int set_coredump_filter(uint64_t value) { |
| sprintf(t, "0x%"PRIx64, value); |
| |
| return write_string_file("/proc/self/coredump_filter", t, |
| - WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); |
| + WRITE_STRING_FILE_VERIFY_ON_FAILURE); |
| } |
| diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c |
| index 0df1778cb2..3b9a0c934e 100644 |
| --- a/src/shared/smack-util.c |
| +++ b/src/shared/smack-util.c |
| @@ -114,7 +114,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/sleep/sleep.c b/src/sleep/sleep.c |
| index 7064f3a905..8f2a7d9da2 100644 |
| --- a/src/sleep/sleep.c |
| +++ b/src/sleep/sleep.c |
| @@ -46,7 +46,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
| assert(hibernate_location->swap); |
| |
| xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); |
| - r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", resume_str, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", |
| hibernate_location->swap->device, resume_str); |
| @@ -73,7 +73,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
| } |
| |
| xsprintf(offset_str, "%" PRIu64, hibernate_location->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 swap file offset to /sys/power/resume_offset for '%s': '%s': %m", |
| hibernate_location->swap->device, offset_str); |
| @@ -89,7 +89,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; |
| |
| @@ -110,7 +110,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); |
| diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
| index cd858c9cca..0feb9669a0 100644 |
| --- a/src/udev/udev-rules.c |
| +++ b/src/udev/udev-rules.c |
| @@ -2335,7 +2335,6 @@ static int udev_rule_apply_token_to_event( |
| log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value); |
| r = write_string_file(buf, value, |
| WRITE_STRING_FILE_VERIFY_ON_FAILURE | |
| - WRITE_STRING_FILE_DISABLE_BUFFER | |
| WRITE_STRING_FILE_AVOID_NEWLINE | |
| WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
| if (r < 0) |
| diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
| index 50930d4af3..5efd5d3728 100644 |
| --- a/src/vconsole/vconsole-setup.c |
| +++ b/src/vconsole/vconsole-setup.c |
| @@ -108,7 +108,7 @@ static int toggle_utf8_vc(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)); |
| |