Date: Mon, 24 May 2010 20:09:40 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libzfs/common libzfs_mount.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs arc.c zfs_ioctl.c Message-ID: <201005242016.o4OKGVw4097061@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
mm 2010-05-24 20:09:40 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
cddl/contrib/opensolaris/lib/libzfs/common libzfs_mount.c
sys/cddl/contrib/opensolaris/uts/common/fs/zfs arc.c
zfs_ioctl.c
Log:
SVN rev 208522 on 2010-05-24 20:09:40Z by mm
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 6748561, 6757075) [1]
Revision Changes Path
1.3.2.2 +6 -4 src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
1.22.2.6 +0 -3 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
1.12.2.8 +8 -5 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005242016.o4OKGVw4097061>