https://github.com/openzfs/zfs/pull/15925 From 68419c70dc7235a4954d6c0c09d60f9ebe694a3c Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 23 Feb 2024 05:12:09 +0000 Subject: [PATCH] Use instead of When building on musl, we get: ``` In file included from tests/zfs-tests/cmd/getversion.c:22: /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] 1 | #warning redirecting incorrect #include to In file included from module/os/linux/zfs/vdev_file.c:36: /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] 1 | #warning redirecting incorrect #include to ``` Bug: https://bugs.gentoo.org/925235 Signed-off-by: Sam James --- module/os/linux/zfs/vdev_file.c | 2 +- tests/zfs-tests/cmd/getversion.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c index 5abc0426d1..68e3042a97 100644 --- a/module/os/linux/zfs/vdev_file.c +++ b/module/os/linux/zfs/vdev_file.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2020 by Delphix. All rights reserved. */ +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include #include #include #ifdef _KERNEL diff --git a/tests/zfs-tests/cmd/getversion.c b/tests/zfs-tests/cmd/getversion.c index 62c1c5b6ab..1e026b92d1 100644 --- a/tests/zfs-tests/cmd/getversion.c +++ b/tests/zfs-tests/cmd/getversion.c @@ -19,9 +19,9 @@ */ #include -#include #include #include +#include #include #include #include -- 2.43.2