Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge 2cb0a4e329 into 1713aa7b4d

This commit is contained in:
Sam James 2024-09-12 04:50:07 +01:00 committed by GitHub
parent 1713aa7b4d 2cb0a4e329
commit 3a8dc4eeb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/linux/zfs/vdev_file.c
View File

@ -33,11 +33,13 @@
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/fm/fs/zfs.h> #include <sys/fm/fs/zfs.h>
#include <sys/abd.h> #include <sys/abd.h>
#include <sys/fcntl.h>
#include <sys/vnode.h> #include <sys/vnode.h>
#include <sys/zfs_file.h> #include <sys/zfs_file.h>
#ifdef _KERNEL #ifdef _KERNEL
#include <linux/falloc.h> #include <linux/falloc.h>
#include <sys/fcntl.h>
#else
#include <fcntl.h>
#endif #endif
/* /*
* Virtual device vector for files. * Virtual device vector for files.

2
tests/zfs-tests/cmd/getversion.c
View File

@ -19,9 +19,9 @@
*/ */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/fcntl.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <err.h> #include <err.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>