The following changes since commit 06812a4f0e4ff4847076e742557ab406a0e96848: Merge branch 'fix_verify_block_offset' of https://github.com/ipylypiv/fio (2023-09-29 00:05:10 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to c95b52caacc8ef5c1235fb3754186e981b109bdb: ci: switch macos runs from macos-12 to macos-13 (2023-09-29 11:51:10 -0400) ---------------------------------------------------------------- Vincent Fu (2): workqueue: handle nice better ci: switch macos runs from macos-12 to macos-13 .github/workflows/ci.yml | 2 +- workqueue.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) --- Diff of recent changes: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69fedf77..b8000024 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: os: ubuntu-22.04 cc: clang - build: macos - os: macos-12 + os: macos-13 - build: linux-i686-gcc os: ubuntu-22.04 arch: i686 diff --git a/workqueue.c b/workqueue.c index 9e6c41ff..3636bc3a 100644 --- a/workqueue.c +++ b/workqueue.c @@ -136,7 +136,8 @@ static void *worker_thread(void *data) sk_out_assign(sw->sk_out); if (wq->ops.nice) { - if (nice(wq->ops.nice) < 0) { + errno = 0; + if (nice(wq->ops.nice) == -1 && errno != 0) { log_err("workqueue: nice %s\n", strerror(errno)); ret = 1; }
