Currently, cg_write() returns 0 on success and -1 on failure. Modify it to return the errno of write() syscall on failure.
Signed-off-by: Yosry Ahmed yosryahmed@google.com --- tools/testing/selftests/cgroup/cgroup_util.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c index dbaa7aabbb4a..ef76db6026aa 100644 --- a/tools/testing/selftests/cgroup/cgroup_util.c +++ b/tools/testing/selftests/cgroup/cgroup_util.c @@ -48,6 +48,8 @@ static ssize_t write_text(const char *path, char *buf, ssize_t len)
len = write(fd, buf, len); if (len < 0) { + /* preserve the errno of write() */ + len = errno; close(fd); return len; } @@ -177,17 +179,16 @@ long cg_read_lc(const char *cgroup, const char *control) return cnt; }
+/* Returns 0 on success, or the errno of write() on failure. */ int cg_write(const char *cgroup, const char *control, char *buf) { char path[PATH_MAX]; - ssize_t len = strlen(buf); + ssize_t len = strlen(buf), ret;
snprintf(path, sizeof(path), "%s/%s", cgroup, control);
- if (write_text(path, buf, len) == len) - return 0; - - return -1; + ret = write_text(path, buf, len); + return ret == len ? 0 : ret; }
int cg_find_unified_root(char *root, size_t len)