mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Minor diff reduction with ZoF in include/sys
- move linux/ includes to platform headers - add void * io_bio to zio for tracking the underlying bio - add freebsd specific fields to abd_scatter Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Kjeld Schouten <kjeld@schouten-lebbing.nl> Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Closes #9615
This commit is contained in:
committed by
Brian Behlendorf
parent
c940bf0c37
commit
d6f67df63c
+5
-4
@@ -29,11 +29,7 @@
|
||||
#include <sys/isa_defs.h>
|
||||
#include <sys/debug.h>
|
||||
#include <sys/refcount.h>
|
||||
#ifdef _KERNEL
|
||||
#include <linux/mm.h>
|
||||
#include <linux/bio.h>
|
||||
#include <sys/uio.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -56,8 +52,13 @@ typedef struct abd {
|
||||
union {
|
||||
struct abd_scatter {
|
||||
uint_t abd_offset;
|
||||
#if defined(__FreeBSD__) && defined(_KERNEL)
|
||||
uint_t abd_chunk_size;
|
||||
void *abd_chunks[];
|
||||
#else
|
||||
uint_t abd_nents;
|
||||
struct scatterlist *abd_sgl;
|
||||
#endif
|
||||
} abd_scatter;
|
||||
struct abd_linear {
|
||||
void *abd_buf;
|
||||
|
||||
Reference in New Issue
Block a user