Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

This commit is contained in:
Brian Behlendorf 2008-12-19 16:34:48 -08:00
parent 4f194c9ddb 96813619bf
commit 6fdfd55847
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libzpool/Makefile.am
View File

@ -45,6 +45,7 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/dsl_prop.c \ ${top_srcdir}/module/zfs/dsl_prop.c \
${top_srcdir}/module/zfs/dsl_deleg.c \ ${top_srcdir}/module/zfs/dsl_deleg.c \
${top_srcdir}/module/zfs/dsl_synctask.c \ ${top_srcdir}/module/zfs/dsl_synctask.c \
${top_srcdir}/module/zfs/dsl_scrub.c \
${top_srcdir}/module/zfs/unique.c \ ${top_srcdir}/module/zfs/unique.c \
${top_srcdir}/module/zfs/zap.c \ ${top_srcdir}/module/zfs/zap.c \
${top_srcdir}/module/zfs/zap_leaf.c \ ${top_srcdir}/module/zfs/zap_leaf.c \

3
module/zfs/Makefile.in
View File

@ -1,7 +1,7 @@
DISTFILES = arc.c bplist.c dbuf.c dmu.c dmu_object.c dmu_objset.c DISTFILES = arc.c bplist.c dbuf.c dmu.c dmu_object.c dmu_objset.c
DISTFILES += dmu_traverse.c dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c DISTFILES += dmu_traverse.c dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c
DISTFILES += dsl_dataset.c dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c DISTFILES += dsl_dataset.c dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c
DISTFILES += dsl_synctask.c fletcher.c gzip.c lzjb.c metaslab.c DISTFILES += dsl_synctask.c dsl_scrub.c fletcher.c gzip.c lzjb.c metaslab.c
DISTFILES += refcount.c sha256.c spa.c spa_boot.c spa_config.c spa_errlog.c DISTFILES += refcount.c sha256.c spa.c spa_boot.c spa_config.c spa_errlog.c
DISTFILES += spa_history.c spa_misc.c space_map.c txg.c uberblock.c DISTFILES += spa_history.c spa_misc.c space_map.c txg.c uberblock.c
DISTFILES += unique.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c DISTFILES += unique.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c
@ -38,6 +38,7 @@ ${MODULE}-objs += dsl_pool.o # Pool-level support
${MODULE}-objs += dsl_prop.o # Property manipulation support ${MODULE}-objs += dsl_prop.o # Property manipulation support
${MODULE}-objs += dsl_deleg.o # XXX: ? ${MODULE}-objs += dsl_deleg.o # XXX: ?
${MODULE}-objs += dsl_synctask.o# XXX: ? ${MODULE}-objs += dsl_synctask.o# XXX: ?
${MODULE}-objs += dsl_scrub.o # Background pool scrubbing
${MODULE}-objs += unique.o # Unique objset ID support ${MODULE}-objs += unique.o # Unique objset ID support
# ZAP (ZFS Attribute Processor) # ZAP (ZFS Attribute Processor)