diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 7ffd81cf28..24ade074ee 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -20,6 +20,7 @@ libzfs_la_SOURCES = \ ${top_srcdir}/lib/libzfs/libzfs_changelist.c \ ${top_srcdir}/lib/libzfs/libzfs_config.c \ ${top_srcdir}/lib/libzfs/libzfs_dataset.c \ + ${top_srcdir}/lib/libzfs/libzfs_fru.c \ ${top_srcdir}/lib/libzfs/libzfs_graph.c \ ${top_srcdir}/lib/libzfs/libzfs_import.c \ ${top_srcdir}/lib/libzfs/libzfs_mount.c \ diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 039d7f60b8..e28d7304b4 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -19,6 +19,7 @@ libzpool_la_SOURCES = \ ${top_srcdir}/lib/libzpool/util.c \ ${top_srcdir}/module/zcommon/zfs_comutil.c \ ${top_srcdir}/module/zcommon/zfs_deleg.c \ + ${top_srcdir}/module/zcommon/zfs_fletcher.c \ ${top_srcdir}/module/zcommon/zfs_namecheck.c \ ${top_srcdir}/module/zcommon/zfs_prop.c \ ${top_srcdir}/module/zcommon/zpool_prop.c \ @@ -27,11 +28,15 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zcommon/include/sys/fs/zfs.h \ ${top_srcdir}/module/zcommon/include/zfs_comutil.h \ ${top_srcdir}/module/zcommon/include/zfs_deleg.h \ + ${top_srcdir}/module/zcommon/include/zfs_fletcher.h \ ${top_srcdir}/module/zcommon/include/zfs_namecheck.h \ ${top_srcdir}/module/zcommon/include/zfs_prop.h \ ${top_srcdir}/module/zfs/arc.c \ ${top_srcdir}/module/zfs/bplist.c \ + ${top_srcdir}/module/zfs/bpobj.c \ ${top_srcdir}/module/zfs/dbuf.c \ + ${top_srcdir}/module/zfs/ddt.c \ + ${top_srcdir}/module/zfs/ddt_zap.c \ ${top_srcdir}/module/zfs/dmu.c \ ${top_srcdir}/module/zfs/dmu_object.c \ ${top_srcdir}/module/zfs/dmu_objset.c \ @@ -42,18 +47,20 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/dnode.c \ ${top_srcdir}/module/zfs/dnode_sync.c \ ${top_srcdir}/module/zfs/dsl_dataset.c \ + ${top_srcdir}/module/zfs/dsl_deadlist.c \ ${top_srcdir}/module/zfs/dsl_deleg.c \ ${top_srcdir}/module/zfs/dsl_dir.c \ ${top_srcdir}/module/zfs/dsl_pool.c \ ${top_srcdir}/module/zfs/dsl_prop.c \ - ${top_srcdir}/module/zfs/dsl_scrub.c \ + ${top_srcdir}/module/zfs/dsl_scan.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 \ ${top_srcdir}/module/zfs/refcount.c \ + ${top_srcdir}/module/zfs/rrwlock.c \ + ${top_srcdir}/module/zfs/sa.c \ ${top_srcdir}/module/zfs/sha256.c \ ${top_srcdir}/module/zfs/spa.c \ ${top_srcdir}/module/zfs/spa_boot.c \ @@ -69,8 +76,8 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/vdev_cache.c \ ${top_srcdir}/module/zfs/vdev_file.c \ ${top_srcdir}/module/zfs/vdev_label.c \ - ${top_srcdir}/module/zfs/vdev_missing.c \ ${top_srcdir}/module/zfs/vdev_mirror.c \ + ${top_srcdir}/module/zfs/vdev_missing.c \ ${top_srcdir}/module/zfs/vdev_queue.c \ ${top_srcdir}/module/zfs/vdev_raidz.c \ ${top_srcdir}/module/zfs/vdev_root.c \ @@ -78,14 +85,17 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/zap_leaf.c \ ${top_srcdir}/module/zfs/zap_micro.c \ ${top_srcdir}/module/zfs/zfs_byteswap.c \ + ${top_srcdir}/module/zfs/zfs_debug.c \ ${top_srcdir}/module/zfs/zfs_fm.c \ ${top_srcdir}/module/zfs/zfs_fuid.c \ + ${top_srcdir}/module/zfs/zfs_sa.c \ ${top_srcdir}/module/zfs/zfs_znode.c \ ${top_srcdir}/module/zfs/zil.c \ ${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/zle.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 \ diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in index 58e2591f60..def2b7d978 100644 --- a/module/zcommon/Makefile.in +++ b/module/zcommon/Makefile.in @@ -14,4 +14,5 @@ ${MODULE}-objs += zfs_prop.o ${MODULE}-objs += zprop_common.o ${MODULE}-objs += zfs_namecheck.o ${MODULE}-objs += zfs_comutil.o +${MODULE}-objs += zfs_fletcher.o ${MODULE}-objs += zpool_prop.o diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 2894008810..3b7a12dea7 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -11,7 +11,10 @@ obj-m := ${MODULE}.o ${MODULE}-objs += arc.o ${MODULE}-objs += bplist.o +${MODULE}-objs += bpobj.o ${MODULE}-objs += dbuf.o +${MODULE}-objs += ddt.o +${MODULE}-objs += ddt_zap.o ${MODULE}-objs += dmu.o ${MODULE}-objs += dmu_object.o ${MODULE}-objs += dmu_objset.o @@ -22,19 +25,20 @@ ${MODULE}-objs += dmu_zfetch.o ${MODULE}-objs += dnode.o ${MODULE}-objs += dnode_sync.o ${MODULE}-objs += dsl_dataset.o +${MODULE}-objs += dsl_deadlist.o ${MODULE}-objs += dsl_deleg.o ${MODULE}-objs += dsl_dir.o ${MODULE}-objs += dsl_pool.o ${MODULE}-objs += dsl_prop.o -${MODULE}-objs += dsl_scrub.o +${MODULE}-objs += dsl_scan.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 ${MODULE}-objs += refcount.o ${MODULE}-objs += rrwlock.o +${MODULE}-objs += sa.o ${MODULE}-objs += sha256.o ${MODULE}-objs += spa.o ${MODULE}-objs += spa_boot.o @@ -61,6 +65,7 @@ ${MODULE}-objs += zap_micro.o ${MODULE}-objs += zfs_acl.o ${MODULE}-objs += zfs_byteswap.o ${MODULE}-objs += zfs_ctldir.o +${MODULE}-objs += zfs_debug.o ${MODULE}-objs += zfs_dir.o ${MODULE}-objs += zfs_fm.o ${MODULE}-objs += zfs_fuid.o @@ -68,6 +73,7 @@ ${MODULE}-objs += zfs_ioctl.o ${MODULE}-objs += zfs_log.o ${MODULE}-objs += zfs_replay.o ${MODULE}-objs += zfs_rlock.o +${MODULE}-objs += zfs_sa.o ${MODULE}-objs += zfs_vfsops.o ${MODULE}-objs += zfs_vnops.o ${MODULE}-objs += zfs_znode.o @@ -76,4 +82,5 @@ ${MODULE}-objs += zio.o ${MODULE}-objs += zio_checksum.o ${MODULE}-objs += zio_compress.o ${MODULE}-objs += zio_inject.o +${MODULE}-objs += zle.o ${MODULE}-objs += zvol.o