Date: Thu, 7 Jan 2010 13:42:28 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: cvs-src-old@freebsd.org 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 ... Message-ID: <201001071342.o07DgnEU071983@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001071342.o07DgnEU071983>