summaryrefslogtreecommitdiffstats
path: root/include/sys
diff options
context:
space:
mode:
authorIsaac Huang <[email protected]>2016-08-31 00:26:43 -0600
committerBrian Behlendorf <[email protected]>2016-11-29 14:34:32 -0800
commitb0be93e81a4ace96a799d3705da6832633eb4325 (patch)
tree7f8782cb7c0a62a3e079b03f96a5fa157e461bcb /include/sys
parenta6255b7fce400d485a0e87cbe369aa0ed7dc5dc4 (diff)
ABD page support to vdev_disk.c
Signed-off-by: Isaac Huang <[email protected]>
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/abd.h7
-rw-r--r--include/sys/spa.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/include/sys/abd.h b/include/sys/abd.h
index 43aaa7a15..6e3530aec 100644
--- a/include/sys/abd.h
+++ b/include/sys/abd.h
@@ -32,6 +32,7 @@
#include <sys/refcount.h>
#ifdef _KERNEL
#include <linux/mm.h>
+#include <linux/bio.h>
#include <sys/uio.h>
#endif
@@ -112,6 +113,12 @@ int abd_cmp(abd_t *, abd_t *);
int abd_cmp_buf_off(abd_t *, const void *, size_t, size_t);
void abd_zero_off(abd_t *, size_t, size_t);
+#if defined(_KERNEL) && defined(HAVE_SPL)
+unsigned int abd_scatter_bio_map_off(struct bio *, abd_t *, unsigned int,
+ size_t);
+unsigned long abd_nr_pages_off(abd_t *, unsigned int, size_t);
+#endif
+
/*
* Wrappers for calls with offsets of 0
*/
diff --git a/include/sys/spa.h b/include/sys/spa.h
index c35128c0d..d679e53d6 100644
--- a/include/sys/spa.h
+++ b/include/sys/spa.h
@@ -586,7 +586,6 @@ extern int spa_get_stats(const char *pool, nvlist_t **config, char *altroot,
size_t buflen);
extern int spa_create(const char *pool, nvlist_t *config, nvlist_t *props,
nvlist_t *zplprops);
-extern int spa_import_rootpool(char *devpath, char *devid);
extern int spa_import(char *pool, nvlist_t *config, nvlist_t *props,
uint64_t flags);
extern nvlist_t *spa_tryimport(nvlist_t *tryconfig);