Fix abd_t definitions in multiple headers.

A typedef for abd_t exists in multiple headers. Include sys/abd.h instead.
DeHackEd · May 22, 2015 · 092bab5 · 092bab5
1 parent 4fef1fa
commit 092bab5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/sys/dmu.h b/include/sys/dmu.h
@@ -45,6 +45,7 @@
 #include <sys/cred.h>
 #include <sys/fs/zfs.h>
 #include <sys/uio.h>
+#include <sys/abd.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -69,7 +70,7 @@ struct arc_buf;
 struct zio_prop;
 struct sa_handle;
 
-typedef struct arc_buf_data abd_t;
+/* typedef struct arc_buf_data abd_t; */
 typedef struct objset objset_t;
 typedef struct dmu_tx dmu_tx_t;
 typedef struct dsl_dir dsl_dir_t;

diff --git a/include/sys/zio.h b/include/sys/zio.h
@@ -35,6 +35,7 @@
 #include <sys/avl.h>
 #include <sys/fs/zfs.h>
 #include <sys/zio_impl.h>
+#include <sys/abd.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -347,7 +348,7 @@ typedef struct zio_gang_node {
 	struct zio_gang_node	*gn_child[SPA_GBH_NBLKPTRS];
 } zio_gang_node_t;
 
-typedef struct arc_buf_data abd_t;
+/* typedef struct arc_buf_data abd_t; */
 
 typedef zio_t *zio_gang_issue_func_t(zio_t *zio, blkptr_t *bp,
     zio_gang_node_t *gn, abd_t *data, uint64_t offset);