From owner-cvs-src-old@FreeBSD.ORG Thu Jan 7 13:42:50 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 1E146106568F for ; Thu, 7 Jan 2010 13:42:50 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02CDF8FC22 for ; Thu, 7 Jan 2010 13:42:49 +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 o07Dgnhx071984 for ; Thu, 7 Jan 2010 13:42:49 GMT (envelope-from netchild@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07DgnEU071983 for cvs-src-old@freebsd.org; Thu, 7 Jan 2010 13:42:49 GMT (envelope-from netchild@repoman.freebsd.org) Message-Id: <201001071342.o07DgnEU071983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to netchild@repoman.freebsd.org using -f From: Alexander Leidinger Date: Thu, 7 Jan 2010 13:42:28 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 Subject: cvs commit: src/sys/cddl/compat/opensolaris/kern opensolaris_policy.c src/sys/cddl/compat/opensolaris/sys kmem.h time.h types.h vnode.h src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs arc.c dbuf.c dmu_objset.c dsl_dataset.c rrwlock.c spa_config.c vdev_geom.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: Thu, 07 Jan 2010 13:42:50 -0000 netchild 2010-01-07 13:42:28 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/cddl/compat/opensolaris/kern opensolaris_policy.c sys/cddl/compat/opensolaris/sys kmem.h time.h types.h vnode.h sys/cddl/contrib/opensolaris/uts/common/fs/zfs arc.c dbuf.c dmu_objset.c dsl_dataset.c rrwlock.c spa_config.c vdev_geom.c vdev_raidz.c zfs_ctldir.c zfs_ioctl.c zfs_log.c zfs_vfsops.c zfs_vnops.c sys/cddl/contrib/opensolaris/uts/common/sys/fs zfs.h Log: SVN rev 201744 on 2010-01-07 13:42:28Z by netchild Diff reduction to 8-stable: - whitespace - fix harmless mismerges - comments or (harmless) code which was there twice - fix not so harmless mismerges (mem leak - double mtx_init) MFC r197842: whitespace fix Revision Changes Path 1.3.2.3 +0 -1 src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c 1.5.2.4 +0 -1 src/sys/cddl/compat/opensolaris/sys/kmem.h 1.3.2.4 +1 -0 src/sys/cddl/compat/opensolaris/sys/time.h 1.4.2.4 +1 -1 src/sys/cddl/compat/opensolaris/sys/types.h 1.6.2.5 +0 -1 src/sys/cddl/compat/opensolaris/sys/vnode.h 1.15.2.5 +1 -4 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c 1.4.2.3 +0 -4 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c 1.3.2.3 +0 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c 1.4.2.4 +0 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c 1.1.2.2 +1 -0 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c 1.6.2.3 +1 -0 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c 1.6.2.5 +6 -6 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c 1.3.2.3 +0 -9 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c 1.8.2.7 +2 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c 1.7.2.6 +0 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c 1.3.2.3 +2 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c 1.14.2.7 +0 -6 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c 1.31.2.10 +1 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 1.4.2.3 +1 -0 src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h