c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 02:49:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 6.1 compat: change order of sys/mutex.h includes

Browse Source 
After Linux 6.1-rc1 came out, the build started failing to build a
couple of the files in the linux spl code due to the mutex_init
redefinition. Moving the sys/mutex.h include to a lower position within
these two files appears to fix the problem.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes #14040
This commit is contained in:
Coleman Kane 2022-10-18 15:29:44 -04:00 committed by GitHub
parent d10bd7d288
commit ecb6a50819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/linux/spl/spl-procfs-list.c
View File

@ -23,9 +23,9 @@
*/ */
#include <sys/list.h> #include <sys/list.h>
#include <sys/mutex.h>
#include <sys/procfs_list.h> #include <sys/procfs_list.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <sys/mutex.h>
/* /*
* A procfs_list is a wrapper around a linked list which implements the seq_file * A procfs_list is a wrapper around a linked list which implements the seq_file

3
module/os/linux/spl/spl-zone.c
View File

@ -25,7 +25,6 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/mutex.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <linux/file.h> #include <linux/file.h>
@ -37,6 +36,8 @@
#include <linux/proc_ns.h> #include <linux/proc_ns.h>
#endif #endif
#include <sys/mutex.h>
static kmutex_t zone_datasets_lock; static kmutex_t zone_datasets_lock;
static struct list_head zone_datasets; static struct list_head zone_datasets;