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

This commit is contained in:
Brian Behlendorf 2009-01-09 14:45:25 -08:00
commit c42f0c8d74
2 changed files with 9 additions and 10 deletions

View File

@ -85,5 +85,4 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/zio.c \ ${top_srcdir}/module/zfs/zio.c \
${top_srcdir}/module/zfs/zio_checksum.c \ ${top_srcdir}/module/zfs/zio_checksum.c \
${top_srcdir}/module/zfs/zio_compress.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/zvol.c

View File

@ -35,7 +35,7 @@ ${MODULE}-objs += gzip.o
${MODULE}-objs += lzjb.o ${MODULE}-objs += lzjb.o
${MODULE}-objs += metaslab.o ${MODULE}-objs += metaslab.o
${MODULE}-objs += refcount.o ${MODULE}-objs += refcount.o
# ${MODULE}-objs += rrwlock.o ${MODULE}-objs += rrwlock.o
${MODULE}-objs += sha256.o ${MODULE}-objs += sha256.o
${MODULE}-objs += spa.o ${MODULE}-objs += spa.o
${MODULE}-objs += spa_boot.o ${MODULE}-objs += spa_boot.o
@ -61,16 +61,16 @@ ${MODULE}-objs += zap_leaf.o
${MODULE}-objs += zap_micro.o ${MODULE}-objs += zap_micro.o
${MODULE}-objs += zfs_acl.o ${MODULE}-objs += zfs_acl.o
${MODULE}-objs += zfs_byteswap.o ${MODULE}-objs += zfs_byteswap.o
# ${MODULE}-objs += zfs_ctldir.o ${MODULE}-objs += zfs_ctldir.o
# ${MODULE}-objs += zfs_dir.o ${MODULE}-objs += zfs_dir.o
${MODULE}-objs += zfs_fm.o ${MODULE}-objs += zfs_fm.o
# ${MODULE}-objs += zfs_fuid.o ${MODULE}-objs += zfs_fuid.o
${MODULE}-objs += zfs_ioctl.o ${MODULE}-objs += zfs_ioctl.o
# ${MODULE}-objs += zfs_log.o ${MODULE}-objs += zfs_log.o
# ${MODULE}-objs += zfs_replay.o ${MODULE}-objs += zfs_replay.o
# ${MODULE}-objs += zfs_rlock.o ${MODULE}-objs += zfs_rlock.o
${MODULE}-objs += zfs_vfsops.o ${MODULE}-objs += zfs_vfsops.o
# ${MODULE}-objs += zfs_vnops.o ${MODULE}-objs += zfs_vnops.o
${MODULE}-objs += zfs_znode.o ${MODULE}-objs += zfs_znode.o
${MODULE}-objs += zil.o ${MODULE}-objs += zil.o
${MODULE}-objs += zio.o ${MODULE}-objs += zio.o