diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2013-03-19 12:51:18 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2013-03-19 12:51:18 +0000 |
| commit | 07091d8f14516499ce46c16836e3aa396d881bed (patch) | |
| tree | 68fb8eac18f4259926de9bd4d4ecba5b46b638c3 /sys/cddl/contrib/opensolaris/uts/common/Makefile.files | |
| parent | 520268fb97910562296705bb9393a2956cbd6a3b (diff) | |
| parent | 577227be9d7e7e691365c6df7c2c70a0cd5c0d96 (diff) | |
| download | src-07091d8f14516499ce46c16836e3aa396d881bed.tar.gz src-07091d8f14516499ce46c16836e3aa396d881bed.zip | |
MFV r247580:
Merge synctask code restructuring from vendor.
Modify forward and backward compatibility to support new change.
Illumos ZFS issues:
3464 zfs synctask code needs restructuring
Sponsored by: Hybrid Logic Ltd.
Notes
Notes:
svn path=/projects/libzfs_core/; revision=248498
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/Makefile.files')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/Makefile.files | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files index 40009e3ff063..d026de8b63e4 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files +++ b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files @@ -49,8 +49,10 @@ ZFS_COMMON_OBJS += \ dsl_dir.o \ dsl_dataset.o \ dsl_deadlist.o \ + dsl_destroy.o \ dsl_pool.o \ dsl_synctask.o \ + dsl_userhold.o \ dmu_zfetch.o \ dsl_deleg.o \ dsl_prop.o \ @@ -61,6 +63,7 @@ ZFS_COMMON_OBJS += \ lzjb.o \ metaslab.o \ refcount.o \ + rrwlock.o \ sa.o \ sha256.o \ spa.o \ @@ -120,7 +123,6 @@ ZFS_OBJS += \ zfs_onexit.o \ zfs_replay.o \ zfs_rlock.o \ - rrwlock.o \ zfs_vfsops.o \ zfs_vnops.o \ zvol.o |