Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use <fcntl.h> instead of <sys/fcntl.h>
Browse files Browse the repository at this point in the history
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 <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
    1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>

In file included from module/os/linux/zfs/vdev_file.c:36:
/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
    1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
```

Bug: https://bugs.gentoo.org/925235
Signed-off-by: Sam James <sam@gentoo.org>
thesamesam authored and behlendorf committed Oct 9, 2024
1 parent efeb60b commit 6dea23b
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion module/os/linux/zfs/vdev_file.c
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion tests/zfs-tests/cmd/getversion.c
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 6dea23b

Please sign in to comment.