From 4d5d0f9ef591a27e62440c0d64ed644b77f71aa9 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 10:55:27 -0700 Subject: [PATCH 1/2] Include FMA source and headers in build system --- lib/libzpool/Makefile.am | 59 ++++++++++++++++++++++++++++++++++++++-- module/zfs/Makefile.in | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index e436c20ddd..039d7f60b8 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -23,7 +23,6 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zcommon/zfs_prop.c \ ${top_srcdir}/module/zcommon/zpool_prop.c \ ${top_srcdir}/module/zcommon/zprop_common.c \ - ${top_srcdir}/module/zcommon/include/sys/fm/fs/zfs.h \ ${top_srcdir}/module/zcommon/include/sys/fs \ ${top_srcdir}/module/zcommon/include/sys/fs/zfs.h \ ${top_srcdir}/module/zcommon/include/zfs_comutil.h \ @@ -50,6 +49,7 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/dsl_scrub.c \ ${top_srcdir}/module/zfs/dsl_synctask.c \ ${top_srcdir}/module/zfs/fletcher.c \ + ${top_srcdir}/module/zfs/fm.c \ ${top_srcdir}/module/zfs/gzip.c \ ${top_srcdir}/module/zfs/lzjb.c \ ${top_srcdir}/module/zfs/metaslab.c \ @@ -85,4 +85,59 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/zio.c \ ${top_srcdir}/module/zfs/zio_checksum.c \ ${top_srcdir}/module/zfs/zio_compress.c \ - ${top_srcdir}/module/zfs/zio_inject.c + ${top_srcdir}/module/zfs/zio_inject.c \ + ${top_srcdir}/module/zfs/include/sys/arc.h \ + ${top_srcdir}/module/zfs/include/sys/bplist.h \ + ${top_srcdir}/module/zfs/include/sys/dbuf.h \ + ${top_srcdir}/module/zfs/include/sys/dmu.h \ + ${top_srcdir}/module/zfs/include/sys/dmu_impl.h \ + ${top_srcdir}/module/zfs/include/sys/dmu_objset.h \ + ${top_srcdir}/module/zfs/include/sys/dmu_traverse.h \ + ${top_srcdir}/module/zfs/include/sys/dmu_tx.h \ + ${top_srcdir}/module/zfs/include/sys/dmu_zfetch.h \ + ${top_srcdir}/module/zfs/include/sys/dnode.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_dataset.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_deleg.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_dir.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_pool.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_prop.h \ + ${top_srcdir}/module/zfs/include/sys/dsl_synctask.h \ + ${top_srcdir}/module/zfs/include/sys/metaslab.h \ + ${top_srcdir}/module/zfs/include/sys/metaslab_impl.h \ + ${top_srcdir}/module/zfs/include/sys/refcount.h \ + ${top_srcdir}/module/zfs/include/sys/rrwlock.h \ + ${top_srcdir}/module/zfs/include/sys/spa_boot.h \ + ${top_srcdir}/module/zfs/include/sys/space_map.h \ + ${top_srcdir}/module/zfs/include/sys/spa.h \ + ${top_srcdir}/module/zfs/include/sys/spa_impl.h \ + ${top_srcdir}/module/zfs/include/sys/txg.h \ + ${top_srcdir}/module/zfs/include/sys/txg_impl.h \ + ${top_srcdir}/module/zfs/include/sys/uberblock.h \ + ${top_srcdir}/module/zfs/include/sys/uberblock_impl.h \ + ${top_srcdir}/module/zfs/include/sys/unique.h \ + ${top_srcdir}/module/zfs/include/sys/vdev_file.h \ + ${top_srcdir}/module/zfs/include/sys/vdev.h \ + ${top_srcdir}/module/zfs/include/sys/vdev_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zap.h \ + ${top_srcdir}/module/zfs/include/sys/zap_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zap_leaf.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_acl.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_context.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_ctldir.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_debug.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_dir.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_fuid.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_ioctl.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_rlock.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_vfsops.h \ + ${top_srcdir}/module/zfs/include/sys/zfs_znode.h \ + ${top_srcdir}/module/zfs/include/sys/zil.h \ + ${top_srcdir}/module/zfs/include/sys/zil_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zio_checksum.h \ + ${top_srcdir}/module/zfs/include/sys/zio_compress.h \ + ${top_srcdir}/module/zfs/include/sys/zio.h \ + ${top_srcdir}/module/zfs/include/sys/zio_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zvol.h \ + ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \ + ${top_srcdir}/module/zfs/include/sys/fm/util.h \ + ${top_srcdir}/module/zfs/include/sys/fm/fs/zfs.h diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 2bde8a89a0..2894008810 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -29,6 +29,7 @@ ${MODULE}-objs += dsl_prop.o ${MODULE}-objs += dsl_scrub.o ${MODULE}-objs += dsl_synctask.o ${MODULE}-objs += fletcher.o +${MODULE}-objs += fm.o ${MODULE}-objs += gzip.o ${MODULE}-objs += lzjb.o ${MODULE}-objs += metaslab.o From 151f424dd811d7f8be1141fb0f3002e951f1b63f Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 10:57:17 -0700 Subject: [PATCH 2/2] Strip ident pragma from module/zfs/include/sys/fm/util.h --- module/zfs/include/sys/fm/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/include/sys/fm/util.h b/module/zfs/include/sys/fm/util.h index 4934814d86..4e19e4de09 100644 --- a/module/zfs/include/sys/fm/util.h +++ b/module/zfs/include/sys/fm/util.h @@ -27,7 +27,7 @@ #ifndef _SYS_FM_UTIL_H #define _SYS_FM_UTIL_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" {