svn commit: r226943 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Sun Oct 30 20:56:54 2011
New Revision: 226943
URL: http://svn.freebsd.org/changeset/base/226943

Log:
  MFC r226724, r226732:
  
  MFC r226724:
  Update copyright information in several ZFS files, as the clause 3.3
  of the CDDL licence explicitly requires every Contributor to add
  a copyright notice.
  
  This also reflects the copyright notices for the changes recently
  added by Illumos.
  
  MFC r226732: [1]
  Fix typo in copyright notice introduced in r226724
  (missing character in e-mail adress)
  
  Reported by:	pjd [1]
  Approved by:	re (kib)

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Sun Oct 30 20:55:32 2011	(r226942)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Sun Oct 30 20:56:54 2011	(r226943)
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright 2011 iXsystems, Inc
  */
 
 #include <sys/zfs_context.h>

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Sun Oct 30 20:55:32 2011	(r226942)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Sun Oct 30 20:56:54 2011	(r226943)
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
  */
 
 #include <sys/zfs_context.h>

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sun Oct 30 20:55:32 2011	(r226942)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sun Oct 30 20:56:54 2011	(r226943)
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
  */
 
 #include <sys/types.h>

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sun Oct 30 20:55:32 2011	(r226942)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sun Oct 30 20:56:54 2011	(r226943)
@@ -23,6 +23,7 @@
  */
 
 /* Portions Copyright 2007 Jeremy Teo */
+/* Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org> */
 
 #ifdef _KERNEL
 #include <sys/types.h>

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Sun Oct 30 20:55:32 2011	(r226942)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Sun Oct 30 20:56:54 2011	(r226943)
@@ -26,6 +26,7 @@
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
+/* Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org> */
 
 /*
  * ZFS volume emulation driver.