]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c10444 d18d85e)
Merge recent vendor changes:
authorMartin Matuska <mm@FreeBSD.org>
Tue, 28 Aug 2012 12:25:37 +0000 (12:25 +0000)
committerMartin Matuska <mm@FreeBSD.org>
Tue, 28 Aug 2012 12:25:37 +0000 (12:25 +0000)
commit6e767def16f94d5cd1a57dd3661e91e525918d0a
treede7860b2979788424d3d99e83f3eac4757202a08tree | snapshot
parent4c1044491b0c97055f329d39a7d130462d38cefbcommit | diff
parentd18d85e2439422e6c4b1178415adb8f93e5c4f17commit | diff
Merge recent vendor changes:
3100 zvol rename fails with EBUSY when dirty
3104 eliminate empty bpobjs
3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc

References:
  https://www.illumos.org/issues/3100
  https://www.illumos.org/issues/3104
  https://www.illumos.org/issues/3120

Obtained from: illumos (vendor/illumos, vendor/illumos-sys)
MFC after: 2 weeks
22 files changed:
UPDATING diff1 | | blob | history
cddl/contrib/opensolaris/cmd/zinject/zinject.c diff1 | diff2 | blob | history
cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 diff1 | | blob | history
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c diff1 | diff2 | blob | history
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.