Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.2] Fix compile-time warnings caused by duplicate struct typedefs #16880

Merged
merged 1 commit into from
Dec 18, 2024
Merged

[2.2] Fix compile-time warnings caused by duplicate struct typedefs #16880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/os/linux/spl/sys/taskq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <sys/thread.h>
#include <sys/rwlock.h>
#include <sys/wait.h>
#include <sys/kstat.h>

#define TASKQ_NAMELEN 31

Expand Down
10 changes: 5 additions & 5 deletions include/os/linux/zfs/sys/abd_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
extern "C" {
#endif

struct abd;

struct abd_scatter {
uint_t abd_offset;
uint_t abd_nents;
Expand All @@ -41,19 +43,17 @@ struct abd_linear {
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 *);
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 *);

/*
* Linux ABD bio functions
* Note: these are only needed to support vdev_classic. See comment in
* vdev_disk.c.
*/
unsigned int abd_bio_map_off(struct bio *, abd_t *, unsigned int, size_t);
unsigned long abd_nr_pages_off(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(struct abd *, unsigned int, size_t);

#ifdef __cplusplus
}
Expand Down
Loading