From fe119cee5788fef8e721d7442c6cae651118d94a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 23 Dec 2008 09:24:19 -0800 Subject: [PATCH] Minor zpios cleanup --- cmd/zpios/Makefile.am | 6 ++++++ cmd/zpios/zpios.h | 2 +- module/zpios/include/Makefile.in | 2 +- module/zpios/include/{kpios-ctl.h => zpios-ctl.h} | 0 module/zpios/include/{kpios-internal.h => zpios-internal.h} | 2 +- module/zpios/{kpios.c => zpios.c} | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) rename module/zpios/include/{kpios-ctl.h => zpios-ctl.h} (100%) rename module/zpios/include/{kpios-internal.h => zpios-internal.h} (99%) rename module/zpios/{kpios.c => zpios.c} (99%) diff --git a/cmd/zpios/Makefile.am b/cmd/zpios/Makefile.am index 91029dbe70..95c9d0f306 100644 --- a/cmd/zpios/Makefile.am +++ b/cmd/zpios/Makefile.am @@ -1,5 +1,11 @@ include $(top_srcdir)/config/Rules.am +DEFAULT_INCLUDES += \ + -I${top_srcdir}/module/zpios/include \ + -I${top_srcdir}/module/zfs \ + -I${top_srcdir}/module/zfs/include \ + -I${top_srcdir}/module/zcommon/include + sbin_PROGRAMS = zpios zpios_SOURCES = \ diff --git a/cmd/zpios/zpios.h b/cmd/zpios/zpios.h index 01c2a9b6c6..ca21188296 100644 --- a/cmd/zpios/zpios.h +++ b/cmd/zpios/zpios.h @@ -33,7 +33,7 @@ #ifndef _ZPIOS_H #define _ZPIOS_H -#include +#include #define VERSION_SIZE 64 diff --git a/module/zpios/include/Makefile.in b/module/zpios/include/Makefile.in index 20e4bd7c9d..3aa71bfa19 100644 --- a/module/zpios/include/Makefile.in +++ b/module/zpios/include/Makefile.in @@ -1 +1 @@ -DISTFILES = kpios-ctl.h kpios-internal.h +DISTFILES = zpios-ctl.h zpios-internal.h diff --git a/module/zpios/include/kpios-ctl.h b/module/zpios/include/zpios-ctl.h similarity index 100% rename from module/zpios/include/kpios-ctl.h rename to module/zpios/include/zpios-ctl.h diff --git a/module/zpios/include/kpios-internal.h b/module/zpios/include/zpios-internal.h similarity index 99% rename from module/zpios/include/kpios-internal.h rename to module/zpios/include/zpios-internal.h index 3da1fe3823..5fecd81ab5 100644 --- a/module/zpios/include/kpios-internal.h +++ b/module/zpios/include/zpios-internal.h @@ -33,7 +33,7 @@ #ifndef _KPIOS_INTERNAL_H #define _KPIOS_INTERNAL_H -#include "kpios-ctl.h" +#include "zpios-ctl.h" #define OBJ_SIZE 64 diff --git a/module/zpios/kpios.c b/module/zpios/zpios.c similarity index 99% rename from module/zpios/kpios.c rename to module/zpios/zpios.c index a6493d8d50..2ba81860ee 100644 --- a/module/zpios/kpios.c +++ b/module/zpios/zpios.c @@ -37,7 +37,7 @@ #include #include #include -#include "kpios-internal.h" +#include "zpios-internal.h" static struct class *kpios_class;