c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile-time warnings caused by duplicate struct typedefs

Browse Source 
Some compiler/versions warn these typedefs according to #16660.

The platform specific header sys/abd_os.h shouldn't define or use abd_t,
as it's defined in its non-platform specific consumer sys/abd.h.
Do the same as what FreeBSD header does.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Closes #16660 
Closes #16665
This commit is contained in:
Tomohiro Kusumi 2024-10-21 01:43:16 +09:00 committed by GitHub
parent fba6a90696
commit a9851ea3dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/os/linux/spl/sys/taskq.h
View File

@ -38,8 +38,7 @@
#include <sys/rwlock.h> #include <sys/rwlock.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/wmsum.h> #include <sys/wmsum.h>
#include <sys/kstat.h>
typedef struct kstat_s kstat_t;
#define TASKQ_NAMELEN 31 #define TASKQ_NAMELEN 31

12
include/os/linux/zfs/sys/abd_os.h
View File

@ -30,6 +30,8 @@
extern "C" { extern "C" {
#endif #endif
struct abd;
struct abd_scatter { struct abd_scatter {
uint_t abd_offset; uint_t abd_offset;
uint_t abd_nents; uint_t abd_nents;
@ -41,10 +43,8 @@ struct abd_linear {
struct scatterlist *abd_sgl; /* for LINEAR_PAGE */ struct scatterlist *abd_sgl; /* for LINEAR_PAGE */
}; };
typedef struct abd abd_t;
typedef int abd_iter_page_func_t(struct page *, size_t, size_t, void *); typedef int abd_iter_page_func_t(struct page *, size_t, size_t, void *);
int abd_iterate_page_func(abd_t *, size_t, size_t, abd_iter_page_func_t *, int abd_iterate_page_func(struct abd *, size_t, size_t, abd_iter_page_func_t *,
void *); void *);
/* /*
@ -52,11 +52,11 @@ int abd_iterate_page_func(abd_t *, size_t, size_t, abd_iter_page_func_t *,
* Note: these are only needed to support vdev_classic. See comment in * Note: these are only needed to support vdev_classic. See comment in
* vdev_disk.c. * vdev_disk.c.
*/ */
unsigned int abd_bio_map_off(struct bio *, abd_t *, unsigned int, size_t); unsigned int abd_bio_map_off(struct bio *, struct abd *, unsigned int, size_t);
unsigned long abd_nr_pages_off(abd_t *, unsigned int, size_t); unsigned long abd_nr_pages_off(struct abd *, unsigned int, size_t);
__attribute__((malloc)) __attribute__((malloc))
abd_t *abd_alloc_from_pages(struct page **, unsigned long, uint64_t); struct abd *abd_alloc_from_pages(struct page **, unsigned long, uint64_t);
#ifdef __cplusplus #ifdef __cplusplus
} }