]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r208472, r208474:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 24 May 2010 20:09:40 +0000 (20:09 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 24 May 2010 20:09:40 +0000 (20:09 +0000)
commit34ef3776217cd2c7b9deaa899bb9a2c5fb2cc701
tree2d8fccf8de3ffda3a2cd09d6cdc12ab2ab0c9f79
parenta5aa0efc3bacc483073607e1205ab030e57ce616
MFC r208472, r208474:

MFC r208472:
Fix zfs receive temporarily changing unchanged stream properties.
Fix possible panic with zfs_enable_datasets.
OpenSolaris onnv revision: 8536:33bd5de3260e [1]

MFC r208474:
Remove kstat.zfs.arcstats.l2_write_bytes_written
The arcstats.l2_write_bytes_written kstat counter introduced
in r205231 was duplicite with vendor's arcstats.l2_write_bytes counter
imported in r208373 (OpenSolaris revision 8582:df9361868dbe)

Approved by: pjd, delphij (mentor)
Obtained from: OpenSolaris (Bug ID 67485616757075) [1]

git-svn-id: svn://svn.freebsd.org/base/stable/8@208522 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c