Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
This commit is contained in:
commit
e8bf0a8581
|
@ -59,6 +59,7 @@ libzpool_la_SOURCES = \
|
||||||
${top_srcdir}/module/zfs/spa_history.c \
|
${top_srcdir}/module/zfs/spa_history.c \
|
||||||
${top_srcdir}/module/zfs/zfs_fm.c \
|
${top_srcdir}/module/zfs/zfs_fm.c \
|
||||||
${top_srcdir}/module/zfs/zfs_byteswap.c \
|
${top_srcdir}/module/zfs/zfs_byteswap.c \
|
||||||
|
${top_srcdir}/module/zfs/zfs_fuid.c \
|
||||||
${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/fletcher.c \
|
${top_srcdir}/module/zfs/fletcher.c \
|
||||||
|
|
|
@ -60,6 +60,8 @@ ${MODULE}-objs += spa_errlog.o # Log of persistent pool-wide data errors
|
||||||
${MODULE}-objs += spa_history.o # Command history support
|
${MODULE}-objs += spa_history.o # Command history support
|
||||||
${MODULE}-objs += spa_boot.o # Bootable root partitions
|
${MODULE}-objs += spa_boot.o # Bootable root partitions
|
||||||
${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support
|
${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support
|
||||||
|
${MODULE}-objs += zfs_byteswap.c # XXX: ?
|
||||||
|
${MODULE}-objs += zfs_fuid.c # XXX: ?
|
||||||
|
|
||||||
# ZIO (ZFS I/O Pipeline)
|
# ZIO (ZFS I/O Pipeline)
|
||||||
${MODULE}-objs += zio.o # Interfaces zio core
|
${MODULE}-objs += zio.o # Interfaces zio core
|
||||||
|
|
Loading…
Reference in New Issue