diff options
| author | Christopher Siden <[email protected]> | 2012-12-13 15:24:15 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-01-08 10:35:35 -0800 |
| commit | 9ae529ec5dbdc828ff8326beae58062971d74b2e (patch) | |
| tree | d65c2d8913391cd03a3e8e06ad77721c5e9cdadc /lib/libzpool/Makefile.am | |
| parent | 15313c5e1866e81e2f4a30d2c50b43b5435e547a (diff) | |
Illumos #2619 and #2747
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Richard Lowe <[email protected]>
Reviewed by: Dan Kruchinin <[email protected]>
Approved by: Eric Schrock <[email protected]>
References:
illumos/illumos-gate@53089ab7c84db6fb76c16ca50076c147cda11757
illumos/illumos-gate@ad135b5d644628e791c3188a6ecbd9c257961ef8
illumos changeset: 13700:2889e2596bd6
https://www.illumos.org/issues/2619
https://www.illumos.org/issues/2747
NOTE: The grub specific changes were not ported. This change
must be made to the Linux grub packages.
Ported-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'lib/libzpool/Makefile.am')
| -rw-r--r-- | lib/libzpool/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index cbe3acd34..1285af325 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -23,6 +23,7 @@ libzpool_la_SOURCES = \ $(top_srcdir)/module/zfs/arc.c \ $(top_srcdir)/module/zfs/bplist.c \ $(top_srcdir)/module/zfs/bpobj.c \ + $(top_srcdir)/module/zfs/bptree.c \ $(top_srcdir)/module/zfs/dbuf.c \ $(top_srcdir)/module/zfs/ddt.c \ $(top_srcdir)/module/zfs/ddt_zap.c \ @@ -74,6 +75,8 @@ libzpool_la_SOURCES = \ $(top_srcdir)/module/zfs/zap.c \ $(top_srcdir)/module/zfs/zap_leaf.c \ $(top_srcdir)/module/zfs/zap_micro.c \ + $(top_srcdir)/module/zfs/zfeature.c \ + $(top_srcdir)/module/zfs/zfeature_common.c \ $(top_srcdir)/module/zfs/zfs_byteswap.c \ $(top_srcdir)/module/zfs/zfs_debug.c \ $(top_srcdir)/module/zfs/zfs_fm.c \ |