aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-11-07 19:20:37 +0000
committerTony Hutter <hutter2@llnl.gov>2025-05-27 21:56:58 +0000
commit3d087fde6e96acc48e095b9a2776f869c708afe4 (patch)
tree8cb909341fba50970116887f00c29f023f08b0a8
parentb800ad856ef94a09f1fe33795f3b30c07d5b81c0 (diff)
-rw-r--r--module/os/linux/zfs/vdev_file.c4
-rw-r--r--tests/zfs-tests/cmd/getversion.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c
index 6d5841a2f0c9..8fec5970aad5 100644
--- a/module/os/linux/zfs/vdev_file.c
+++ b/module/os/linux/zfs/vdev_file.c
@@ -33,11 +33,13 @@
#include <sys/fs/zfs.h>
#include <sys/fm/fs/zfs.h>
#include <sys/abd.h>
-#include <sys/fcntl.h>
#include <sys/vnode.h>
#include <sys/zfs_file.h>
#ifdef _KERNEL
#include <linux/falloc.h>
+#include <sys/fcntl.h>
+#else
+#include <fcntl.h>
#endif
/*
* Virtual device vector for files.
diff --git a/tests/zfs-tests/cmd/getversion.c b/tests/zfs-tests/cmd/getversion.c
index 62c1c5b6abc0..1e026b92d17d 100644
--- a/tests/zfs-tests/cmd/getversion.c
+++ b/tests/zfs-tests/cmd/getversion.c
@@ -19,9 +19,9 @@
*/
#include <sys/ioctl.h>
-#include <sys/fcntl.h>
#include <linux/fs.h>
#include <err.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>