From owner-cvs-src-old@FreeBSD.ORG Mon May 24 20:16:31 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BA251065675 for ; Mon, 24 May 2010 20:16:31 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78AAD8FC1E for ; Mon, 24 May 2010 20:16:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4OKGVjr097062 for ; Mon, 24 May 2010 20:16:31 GMT (envelope-from mm@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4OKGVw4097061 for cvs-src-old@freebsd.org; Mon, 24 May 2010 20:16:31 GMT (envelope-from mm@repoman.freebsd.org) Message-Id: <201005242016.o4OKGVw4097061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to mm@repoman.freebsd.org using -f From: Martin Matuska Date: Mon, 24 May 2010 20:09:40 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 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 X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2010 20:16:31 -0000 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