Compile zio.h and zio_impl.h mutual include

zio.h includes zio_impl.h but zio_impl.h also includes zio.h, so the
header files to contain each other.  Get rid of the zio_impl.h include
in zio.h and update zio_inject.c to include zio.h instead of zio_impl.h.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5439

diff --git a/include/sys/zio_impl.h b/include/sys/zio_impl.h
index a36749a308d675fb77fae43923304a954d97c086..4d56e906666fac5b8f4f4bc418e74256a5992175 100644 (file)
--- a/include/sys/zio_impl.h
+++ b/include/sys/zio_impl.h
@@ -30,9 +30,6 @@
 #ifndef _ZIO_IMPL_H
 #define        _ZIO_IMPL_H
 
-#include <sys/zfs_context.h>
-#include <sys/zio.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/module/zfs/zio_inject.c b/module/zfs/zio_inject.c
index 61b7d25e6536c230868742e7724b5f9e5d096353..0e8e9d9321074bb8fc84ec16990ee31467336400 100644 (file)
--- a/module/zfs/zio_inject.c
+++ b/module/zfs/zio_inject.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/arc.h>
-#include <sys/zio_impl.h>
+#include <sys/zio.h>
 #include <sys/zfs_ioctl.h>
 #include <sys/vdev_impl.h>
 #include <sys/dmu_objset.h>