Update copyrights on source files changed since 2010-02-15.

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index 7d75c6f..8362584 100644 (file)
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/darwin/kp30.h b/libcfs/include/libcfs/darwin/kp30.h
index e33f79f..7dc581e 100644 (file)
--- a/libcfs/include/libcfs/darwin/kp30.h
+++ b/libcfs/include/libcfs/darwin/kp30.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h
index 940a826..6a13331 100644 (file)
--- a/libcfs/include/libcfs/libcfs_debug.h
+++ b/libcfs/include/libcfs/libcfs_debug.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/libcfs_hash.h b/libcfs/include/libcfs/libcfs_hash.h
index 9011de7..f94c7dc 100644 (file)
--- a/libcfs/include/libcfs/libcfs_hash.h
+++ b/libcfs/include/libcfs/libcfs_hash.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/libcfs_kernelcomm.h b/libcfs/include/libcfs/libcfs_kernelcomm.h
index 59eb194..ff919b1 100644 (file)
--- a/libcfs/include/libcfs/libcfs_kernelcomm.h
+++ b/libcfs/include/libcfs/libcfs_kernelcomm.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h
index 814c2af..b1dad03 100644 (file)
--- a/libcfs/include/libcfs/libcfs_private.h
+++ b/libcfs/include/libcfs/libcfs_private.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/libcfsutil.h b/libcfs/include/libcfs/libcfsutil.h
index c5d5e04..f7c446a 100644 (file)
--- a/libcfs/include/libcfs/libcfsutil.h
+++ b/libcfs/include/libcfs/libcfsutil.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h
index f1b4360..ff7c36f 100644 (file)
--- a/libcfs/include/libcfs/linux/kp30.h
+++ b/libcfs/include/libcfs/linux/kp30.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h
index 2e740f5..501535e 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-fs.h
+++ b/libcfs/include/libcfs/linux/linux-fs.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/linux/linux-lock.h b/libcfs/include/libcfs/linux/linux-lock.h
index 18dbfc8..83d6be1 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-lock.h
+++ b/libcfs/include/libcfs/linux/linux-lock.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/linux/portals_compat25.h b/libcfs/include/libcfs/linux/portals_compat25.h
index 7a87224..6058c59 100644 (file)
--- a/libcfs/include/libcfs/linux/portals_compat25.h
+++ b/libcfs/include/libcfs/linux/portals_compat25.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/posix/libcfs.h b/libcfs/include/libcfs/posix/libcfs.h
index c0d5913..18551ca 100644 (file)
--- a/libcfs/include/libcfs/posix/libcfs.h
+++ b/libcfs/include/libcfs/posix/libcfs.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/posix/posix-wordsize.h b/libcfs/include/libcfs/posix/posix-wordsize.h
index f675960..ede6dce 100644 (file)
--- a/libcfs/include/libcfs/posix/posix-wordsize.h
+++ b/libcfs/include/libcfs/posix/posix-wordsize.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/user-lock.h b/libcfs/include/libcfs/user-lock.h
index bd89217..d6da6a5 100644 (file)
--- a/libcfs/include/libcfs/user-lock.h
+++ b/libcfs/include/libcfs/user-lock.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/user-prim.h b/libcfs/include/libcfs/user-prim.h
index ff044b9..9b2755c 100644 (file)
--- a/libcfs/include/libcfs/user-prim.h
+++ b/libcfs/include/libcfs/user-prim.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/include/libcfs/winnt/kp30.h b/libcfs/include/libcfs/winnt/kp30.h
index 996ec6c..38c1197 100644 (file)
--- a/libcfs/include/libcfs/winnt/kp30.h
+++ b/libcfs/include/libcfs/winnt/kp30.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index f679067..644cd57 100644 (file)
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -25,7 +25,7 @@
 #
 
 #
 #
 
 #

-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

 # Use is subject to license terms.
 #
 
 # Use is subject to license terms.
 #
 

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index fc2ac95..3e0231a 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/hash.c b/libcfs/libcfs/hash.c
index cba1d37..699db39 100644 (file)
--- a/libcfs/libcfs/hash.c
+++ b/libcfs/libcfs/hash.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/kernel_user_comm.c b/libcfs/libcfs/kernel_user_comm.c
index 7ac1f9e..4c356e9 100644 (file)
--- a/libcfs/libcfs/kernel_user_comm.c
+++ b/libcfs/libcfs/kernel_user_comm.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/linux/linux-curproc.c b/libcfs/libcfs/linux/linux-curproc.c
index 4bfcca3..3a8bab7 100644 (file)
--- a/libcfs/libcfs/linux/linux-curproc.c
+++ b/libcfs/libcfs/linux/linux-curproc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index d8b4b47..c882f06 100644 (file)
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/linux/linux-fs.c b/libcfs/libcfs/linux/linux-fs.c
index 4c661fe..82ecbf2 100644 (file)
--- a/libcfs/libcfs/linux/linux-fs.c
+++ b/libcfs/libcfs/linux/linux-fs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index 4efd8dc..5c5af72 100644 (file)
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/linux/linux-tracefile.h b/libcfs/libcfs/linux/linux-tracefile.h
index 4bae601..d1c327d 100644 (file)
--- a/libcfs/libcfs/linux/linux-tracefile.h
+++ b/libcfs/libcfs/linux/linux-tracefile.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c
index da566c0..0402dc2 100644 (file)
--- a/libcfs/libcfs/tracefile.c
+++ b/libcfs/libcfs/tracefile.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/util/util.c b/libcfs/libcfs/util/util.c
index f830223..021f28f 100644 (file)
--- a/libcfs/libcfs/util/util.c
+++ b/libcfs/libcfs/util/util.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2010 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c
index 855bf7b..131daa3 100644 (file)
--- a/libcfs/libcfs/watchdog.c
+++ b/libcfs/libcfs/watchdog.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index ad3440c..e6edd00 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index 55b5913..7ebee52 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 957fe31..9532d7c 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index c960578..e516349 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 29c9ff3..ae6045f 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  *
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>
  *
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index fa343f7..453bd0e 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  *
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>
  *
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>

diff --git a/lnet/klnds/socklnd/socklnd_modparams.c b/lnet/klnds/socklnd/socklnd_modparams.c
index 8678437..ff7049a 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_modparams.c
+++ b/lnet/klnds/socklnd/socklnd_modparams.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  *
  *   Author: Eric Barton <eric@bartonsoftware.com>
  *
  *
  *   Author: Eric Barton <eric@bartonsoftware.com>
  *

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 5c335b4..2f681d7 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index 837c2a7..cd9bdca 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  *
  *   This file is part of Portals
  *   http://sourceforge.net/projects/sandiaportals/
  *
  *   This file is part of Portals
  *   http://sourceforge.net/projects/sandiaportals/

diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c
index 9c6e2e7..e376ce3 100644 (file)
--- a/lnet/selftest/conrpc.c
+++ b/lnet/selftest/conrpc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 111ca0e..f4de757 100644 (file)
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 886c8e0..4f883c9 100644 (file)
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -27,7 +27,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index bcd7099..75b8853 100644 (file)
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c
index 776b041..b89e981 100644 (file)
--- a/lnet/utils/lst.c
+++ b/lnet/utils/lst.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lnet/utils/lstclient.c b/lnet/utils/lstclient.c
index 6f46549..1d72000 100644 (file)
--- a/lnet/utils/lstclient.c
+++ b/lnet/utils/lstclient.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/cmm/mdc_device.c b/lustre/cmm/mdc_device.c
index 3e7da7c..339540b 100644 (file)
--- a/lustre/cmm/mdc_device.c
+++ b/lustre/cmm/mdc_device.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/cmm/mdc_object.c b/lustre/cmm/mdc_object.c
index 383db56..191cbbf 100644 (file)
--- a/lustre/cmm/mdc_object.c
+++ b/lustre/cmm/mdc_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 6ba90a0..846d8dc 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -25,7 +25,7 @@
 #
 
 #
 #
 
 #

-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.

 # Use is subject to license terms.
 #
 
 # Use is subject to license terms.
 #
 

diff --git a/lustre/doc/mount.lustre.8 b/lustre/doc/mount.lustre.8
index f250ad2..ea63a20 100644 (file)
--- a/lustre/doc/mount.lustre.8
+++ b/lustre/doc/mount.lustre.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
 .\" -*- nroff -*-

-.\" Copyright 2008 by Sun Microsystems.  All Rights Reserved.
+.\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

 .\" This file may be copied under the terms of the GNU Public License v2.
 .\"
 .TH mount.lustre 8 "2008 Mar 15" Lustre "configuration utilities"
 .\" This file may be copied under the terms of the GNU Public License v2.
 .\"
 .TH mount.lustre 8 "2008 Mar 15" Lustre "configuration utilities"

diff --git a/lustre/doc/tunefs.lustre.8 b/lustre/doc/tunefs.lustre.8
index c1b2d5b..ec4db1a 100644 (file)
--- a/lustre/doc/tunefs.lustre.8
+++ b/lustre/doc/tunefs.lustre.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
 .\" -*- nroff -*-

-.\" Copyright 2008 by Sun Microsystems, Inc.  All Rights Reserved.
+.\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

 .\" This file may be copied under the terms of the GNU Public License, v2.
 .\"
 .TH tunefs.lustre 8 "2008 Mar 15" Lustre "configuration utilities"
 .\" This file may be copied under the terms of the GNU Public License, v2.
 .\"
 .TH tunefs.lustre 8 "2008 Mar 15" Lustre "configuration utilities"

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 7ce5569..de14514 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/fid/fid_internal.h b/lustre/fid/fid_internal.h
index 428044c..96fb114 100644 (file)
--- a/lustre/fid/fid_internal.h
+++ b/lustre/fid/fid_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/fid/fid_lib.c b/lustre/fid/fid_lib.c
index ec50951..f98efac 100644 (file)
--- a/lustre/fid/fid_lib.c
+++ b/lustre/fid/fid_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 7b5d545..436cba2 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c
index feb34ef..2226d5e 100644 (file)
--- a/lustre/fid/fid_store.c
+++ b/lustre/fid/fid_store.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index aa0c748..66d29b5 100644 (file)
--- a/lustre/fld/fld_index.c
+++ b/lustre/fld/fld_index.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index 94a5b01..91b32c9 100644 (file)
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/darwin/lustre_user.h b/lustre/include/darwin/lustre_user.h
index 4756186..3821a83 100644 (file)
--- a/lustre/include/darwin/lustre_user.h
+++ b/lustre/include/darwin/lustre_user.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h
index b50278b..2b0d391 100644 (file)
--- a/lustre/include/interval_tree.h
+++ b/lustre/include/interval_tree.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lclient.h b/lustre/include/lclient.h
index 2162c56..1883df6 100644 (file)
--- a/lustre/include/lclient.h
+++ b/lustre/include/lclient.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index ec58e37..2ebe835 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index f526f45..5f0a199 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 771e21f..8f027dc 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
index 7157130..228ca9f 100644 (file)
--- a/lustre/include/lprocfs_status.h
+++ b/lustre/include/lprocfs_status.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index 775e29b..54a72c5 100644 (file)
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h
index b13a05f..19bf8ff 100644 (file)
--- a/lustre/include/lu_target.h
+++ b/lustre/include/lu_target.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre/libiam.h b/lustre/include/lustre/libiam.h
index bac2d10..dd61a33 100644 (file)
--- a/lustre/include/lustre/libiam.h
+++ b/lustre/include/lustre/libiam.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre/liblustreapi.h b/lustre/include/lustre/liblustreapi.h
index 12bd8a1..a48887d 100644 (file)
--- a/lustre/include/lustre/liblustreapi.h
+++ b/lustre/include/lustre/liblustreapi.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ff1799d..10b2997 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index 0709027..e949fe1 100644 (file)
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_capa.h b/lustre/include/lustre_capa.h
index 5c5660e..33f1199 100644 (file)
--- a/lustre/include/lustre_capa.h
+++ b/lustre/include/lustre_capa.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index ae956bf..f3d60a6 100644 (file)
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h
index 027d757..6662f48 100644 (file)
--- a/lustre/include/lustre_debug.h
+++ b/lustre/include/lustre_debug.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 268d531..56ac7b0 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 27feb6f..76f5814 100644 (file)
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 80906f4..e25eb07 100644 (file)
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index b2e638a..629a635 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 6d9d725..9311d40 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index da971ab..571ec45 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_ha.h b/lustre/include/lustre_ha.h
index a9cdbc0..c88a281 100644 (file)
--- a/lustre/include/lustre_ha.h
+++ b/lustre/include/lustre_ha.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 5db904e..13bbb3a 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_idmap.h b/lustre/include/lustre_idmap.h
index fa14de1..d75a034 100644 (file)
--- a/lustre/include/lustre_idmap.h
+++ b/lustre/include/lustre_idmap.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index 4ab3acc..0e93bcc 100644 (file)
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h
index 5e2627b..610ac15 100644 (file)
--- a/lustre/include/lustre_lib.h
+++ b/lustre/include/lustre_lib.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_lite.h b/lustre/include/lustre_lite.h
index 13093e7..cb0e730 100644 (file)
--- a/lustre/include/lustre_lite.h
+++ b/lustre/include/lustre_lite.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h
index a4cd24d..8c0845d 100644 (file)
--- a/lustre/include/lustre_log.h
+++ b/lustre/include/lustre_log.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_mdc.h b/lustre/include/lustre_mdc.h
index 381a676..f095a71 100644 (file)
--- a/lustre/include/lustre_mdc.h
+++ b/lustre/include/lustre_mdc.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index 59951fc..2a586ff 100644 (file)
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_mdt.h b/lustre/include/lustre_mdt.h
index 0375f55..d575768 100644 (file)
--- a/lustre/include/lustre_mdt.h
+++ b/lustre/include/lustre_mdt.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index cf04463..1b3d57d 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_param.h b/lustre/include/lustre_param.h
index ffa5eb9..883eae3 100644 (file)
--- a/lustre/include/lustre_param.h
+++ b/lustre/include/lustre_param.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h
index f9d1e15..3b59537 100644 (file)
--- a/lustre/include/lustre_quota.h
+++ b/lustre/include/lustre_quota.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_req_layout.h b/lustre/include/lustre_req_layout.h
index 0cff94f..88a2ecf 100644 (file)
--- a/lustre/include/lustre_req_layout.h
+++ b/lustre/include/lustre_req_layout.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h
index 0e46c40..7158d6a 100644 (file)
--- a/lustre/include/lustre_sec.h
+++ b/lustre/include/lustre_sec.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/lustre_ucache.h b/lustre/include/lustre_ucache.h
index aa5d8d9..c81a548 100644 (file)
--- a/lustre/include/lustre_ucache.h
+++ b/lustre/include/lustre_ucache.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 0f43ce8..ebe7112 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 82c3f06..611c6e4 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index dac91cf..81b5f44 100644 (file)
--- a/lustre/include/obd_ost.h
+++ b/lustre/include/obd_ost.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index fc51ca0..6dd3f80 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lclient/glimpse.c b/lustre/lclient/glimpse.c
index 1d523c1..8c69708 100644 (file)
--- a/lustre/lclient/glimpse.c
+++ b/lustre/lclient/glimpse.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lclient/lcommon_cl.c b/lustre/lclient/lcommon_cl.c
index 60fc4c7..c172e9d 100644 (file)
--- a/lustre/lclient/lcommon_cl.c
+++ b/lustre/lclient/lcommon_cl.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/interval_tree.c b/lustre/ldlm/interval_tree.c
index e3cc88d..5d54f25 100644 (file)
--- a/lustre/ldlm/interval_tree.c
+++ b/lustre/ldlm/interval_tree.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index 780296d..1c504a1 100644 (file)
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 8e17167..9b24bed 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  *
  * Copyright (c) 2003 Hewlett-Packard Development Company LP.
  * Use is subject to license terms.
  *
  * Copyright (c) 2003 Hewlett-Packard Development Company LP.

diff --git a/lustre/ldlm/ldlm_inodebits.c b/lustre/ldlm/ldlm_inodebits.c
index 406d059..187bb74 100644 (file)
--- a/lustre/ldlm/ldlm_inodebits.c
+++ b/lustre/ldlm/ldlm_inodebits.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index efa6238..cbad123 100644 (file)
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 943f0b1..16578d8 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index cf7a5b0..cd8623d 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index f287f1a..ae98536 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index 8499db8..fb33c35 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index 32f41ae..aa56124 100644 (file)
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index a0a231f..50fc4b8 100644 (file)
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h
index 5fd0dc4..efc130b 100644 (file)
--- a/lustre/liblustre/llite_lib.h
+++ b/lustre/liblustre/llite_lib.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c
index da5f150..797e911 100644 (file)
--- a/lustre/liblustre/namei.c
+++ b/lustre/liblustre/namei.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index c9c0fe7..9d4d581 100644 (file)
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index dc67104..4279fec 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index f648e72..736c492 100644 (file)
--- a/lustre/liblustre/tests/sanity.c
+++ b/lustre/liblustre/tests/sanity.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 52c7e82..6f1698c 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 8e8ed3a..f145b8c 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 103420b..693dc35 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 2f0ae29..b8788d2 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index e7c62b8..7fad1fc 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 31ccf8c..6e30f40 100644 (file)
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index 66e9741..25352ae 100644 (file)
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
index 7dc924a..3976da3 100644 (file)
--- a/lustre/llite/lloop.c
+++ b/lustre/llite/lloop.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index 124f024..a9623a0 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 30d5d20..ee51be1 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 1a96289..7d5adcd 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index b5f64b0..4c3f0e0 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 5d51215..fcf2eb5 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index 5db4708..9e3cdee 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index d928264..7d16160 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index b0780d2..2dc57cb 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 691df29..5f91a7f 100644 (file)
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 960a7bd..5098eae 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index e003468..031458b 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lmv/lmv_object.c b/lustre/lmv/lmv_object.c
index f2616d6..81b44e2 100644 (file)
--- a/lustre/lmv/lmv_object.c
+++ b/lustre/lmv/lmv_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_cl_internal.h b/lustre/lov/lov_cl_internal.h
index 76cd5e4..a892bc1 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 4785944..d658407 100755 (executable)
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c
index 399b078..6591bda 100644 (file)
--- a/lustre/lov/lov_io.c
+++ b/lustre/lov/lov_io.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_lock.c b/lustre/lov/lov_lock.c
index cb81e72..d0cdbed 100644 (file)
--- a/lustre/lov/lov_lock.c
+++ b/lustre/lov/lov_lock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index fb22e4f..c3d6c10 100644 (file)
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index 856418a..ce3f1d4 100644 (file)
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index c7c7d64..1206dcd 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index d75b53b..658b34d 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index fea8cce..33b1a79 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_qos.c b/lustre/lov/lov_qos.c
index 7028b68..e5124be 100644 (file)
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lov_request.c b/lustre/lov/lov_request.c
index a6b3ade..01095df 100644 (file)
--- a/lustre/lov/lov_request.c
+++ b/lustre/lov/lov_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index d1057f3..7793074 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 67bddb9..82f8879 100644 (file)
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/lvfs/lustre_quota_fmt.c b/lustre/lvfs/lustre_quota_fmt.c
index 26944fc..cb4d42d 100644 (file)
--- a/lustre/lvfs/lustre_quota_fmt.c
+++ b/lustre/lvfs/lustre_quota_fmt.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c
index b7d0dae..0983f8d 100644 (file)
--- a/lustre/mdc/lproc_mdc.c
+++ b/lustre/mdc/lproc_mdc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index 1b7da75..56985d9 100644 (file)
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 96f05d1..1e4bc75 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index bf35450..b70e974 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 6225c50..749a85d 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 388780e..58f4602 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c
index d11ffea..97fef89 100644 (file)
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
index 0ea8b9a..9cd1193 100644 (file)
--- a/lustre/mdd/mdd_lov.c
+++ b/lustre/mdd/mdd_lov.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index e52a20b..6f57ea8 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c
index c64327c..326e0b0 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index a0c4716..d534e80 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c
index 3b3aa3a..4e0e0a5 100644 (file)
--- a/lustre/mds/lproc_mds.c
+++ b/lustre/mds/lproc_mds.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index ba5df4b..eba7427 100644 (file)
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index 582531e..3bd6a83 100644 (file)
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index 66a037a..ba289da 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_capa.c b/lustre/mdt/mdt_capa.c
index f01940d..9ab150c 100644 (file)
--- a/lustre/mdt/mdt_capa.c
+++ b/lustre/mdt/mdt_capa.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_fs.c b/lustre/mdt/mdt_fs.c
index 599881e..1cb1fc4 100644 (file)
--- a/lustre/mdt/mdt_fs.c
+++ b/lustre/mdt/mdt_fs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index a064ca4..3583a2b 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
index 743b64b..cecae70 100644 (file)
--- a/lustre/mdt/mdt_internal.h
+++ b/lustre/mdt/mdt_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index dbe9788..b513d44 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 801925a..ee8d062 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index 7c90fd5..bf658e0 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 3ffd2e6..0755efd 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index 27fc03a..5fd6ffc 100644 (file)
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 7e31ff8..df6122c 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c
index 1801c04..a16449f 100644 (file)
--- a/lustre/mgs/lproc_mgs.c
+++ b/lustre/mgs/lproc_mgs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index bd69bca..fc643f8 100644 (file)
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index 76859e4..d2ee15d 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h
index 2cb320a..703290b 100644 (file)
--- a/lustre/mgs/mgs_internal.h
+++ b/lustre/mgs/mgs_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 1310334..f84f3fc 100644 (file)
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/cl_lock.c b/lustre/obdclass/cl_lock.c
index 0726ab6..ad244e4 100644 (file)
--- a/lustre/obdclass/cl_lock.c
+++ b/lustre/obdclass/cl_lock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c
index f8ef9f7..88f3cfd 100644 (file)
--- a/lustre/obdclass/cl_object.c
+++ b/lustre/obdclass/cl_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c
index 1f9aedd..c56b73b 100644 (file)
--- a/lustre/obdclass/cl_page.c
+++ b/lustre/obdclass/cl_page.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index fd038cf..c8f9298 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/linux/linux-obdo.c b/lustre/obdclass/linux/linux-obdo.c
index 77b5da4..9007833 100644 (file)
--- a/lustre/obdclass/linux/linux-obdo.c
+++ b/lustre/obdclass/linux/linux-obdo.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog.c b/lustre/obdclass/llog.c
index 202610d..6469578 100644 (file)
--- a/lustre/obdclass/llog.c
+++ b/lustre/obdclass/llog.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c
index 8d32edf..48a2032 100644 (file)
--- a/lustre/obdclass/llog_cat.c
+++ b/lustre/obdclass/llog_cat.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog_internal.h b/lustre/obdclass/llog_internal.h
index a0d4205..0a2a90a 100644 (file)
--- a/lustre/obdclass/llog_internal.h
+++ b/lustre/obdclass/llog_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index 23383cf..601bc42 100644 (file)
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c
index e30d678..ddced97 100644 (file)
--- a/lustre/obdclass/llog_lvfs.c
+++ b/lustre/obdclass/llog_lvfs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 2947989..e70a453 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index bb85e8e..fc6ed23 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c
index a0f93ec..8a86fa5 100644 (file)
--- a/lustre/obdclass/lu_object.c
+++ b/lustre/obdclass/lu_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index 144408b..1fdfb12 100644 (file)
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 56b2e57..c48f8b4 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 1a88376..9da2405 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index 67f018b..79756e6 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index a5b27c9..cfd1ff3 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index e144254..5ce5a27 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_capa.c b/lustre/obdfilter/filter_capa.c
index d99357e..6595374 100644 (file)
--- a/lustre/obdfilter/filter_capa.c
+++ b/lustre/obdfilter/filter_capa.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h
index 25e6e0b..91d8ef9 100644 (file)
--- a/lustre/obdfilter/filter_internal.h
+++ b/lustre/obdfilter/filter_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index bc7bda4..3b6c2fb 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index 621ee05..d6a356e 100644 (file)
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index 1f5d4fb..f62ee93 100644 (file)
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index 554b606..08c41e2 100644 (file)
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c
index e39ae9b..01bc378 100644 (file)
--- a/lustre/obdfilter/lproc_obdfilter.c
+++ b/lustre/obdfilter/lproc_obdfilter.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 3815169..086c94b 100644 (file)
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index b8e56eb..16cd956 100644 (file)
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index 93e5a67..8915ad5 100644 (file)
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 0e2d042..8bf8039 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index 5fe0eb2..53366f8 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 8bd2dc7..e2ea260 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index b394fcd..28be07e 100644 (file)
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index cc8df43..3081093 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 713b6a8..22bf7d9 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index e9e5d2c..2a6b90a 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osd/osd_igif.c b/lustre/osd/osd_igif.c
index 4e987a2..9bd8052 100644 (file)
--- a/lustre/osd/osd_igif.c
+++ b/lustre/osd/osd_igif.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osd/osd_internal.h b/lustre/osd/osd_internal.h
index 0b3aad3..e56974e 100644 (file)
--- a/lustre/osd/osd_internal.h
+++ b/lustre/osd/osd_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/osd/osd_oi.c b/lustre/osd/osd_oi.c
index 5d91f33..c63b7f5 100644 (file)
--- a/lustre/osd/osd_oi.c
+++ b/lustre/osd/osd_oi.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 945ad73..4bbf6c5 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ost/ost_internal.h b/lustre/ost/ost_internal.h
index ec99c0a..df3a1f6 100644 (file)
--- a/lustre/ost/ost_internal.h
+++ b/lustre/ost/ost_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 993ecda..a844650 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index e27c226..77b48ef 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index fbfee41..8441c6c 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/gss/sec_gss.c b/lustre/ptlrpc/gss/sec_gss.c
index 394ab24..2cd6dea 100644 (file)
--- a/lustre/ptlrpc/gss/sec_gss.c
+++ b/lustre/ptlrpc/gss/sec_gss.c
@@ -3,7 +3,7 @@
  *
  * Modifications for Lustre
  *
  *
  * Modifications for Lustre
  *

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index cef2a40..1a461f1 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c
index 333429e..edd4f19 100644 (file)
--- a/lustre/ptlrpc/layout.c
+++ b/lustre/ptlrpc/layout.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 2818696..cd6ee67 100644 (file)
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index f989029..db59ddc 100644 (file)
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index 08a34f0..508f0e2 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 094b740..ee9400d 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index 8584adb..d2f56f5 100644 (file)
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index c9c565c..78c0546 100644 (file)
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index 050d125..17085d6 100644 (file)
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 1d64af4..86c5a99 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c
index 52100ae..34a9284 100644 (file)
--- a/lustre/ptlrpc/sec_null.c
+++ b/lustre/ptlrpc/sec_null.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 2e92cb1..5f67efa 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/target.c b/lustre/ptlrpc/target.c
index db2de79..a1961b0 100644 (file)
--- a/lustre/ptlrpc/target.c
+++ b/lustre/ptlrpc/target.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index ed20943..d084ffb 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/lproc_quota.c b/lustre/quota/lproc_quota.c
index 49d16ab..21ec147 100644 (file)
--- a/lustre/quota/lproc_quota.c
+++ b/lustre/quota/lproc_quota.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_adjust_qunit.c b/lustre/quota/quota_adjust_qunit.c
index 7d82116..7839972 100644 (file)
--- a/lustre/quota/quota_adjust_qunit.c
+++ b/lustre/quota/quota_adjust_qunit.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_check.c b/lustre/quota/quota_check.c
index 17f20d8..1961e40 100644 (file)
--- a/lustre/quota/quota_check.c
+++ b/lustre/quota/quota_check.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index d9d7be0..9f9035a 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c
index 7c9a66a..7a4f1cf 100644 (file)
--- a/lustre/quota/quota_ctl.c
+++ b/lustre/quota/quota_ctl.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index 11825d5..1ee62b0 100644 (file)
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_internal.h b/lustre/quota/quota_internal.h
index a96390d..563c1e7 100644 (file)
--- a/lustre/quota/quota_internal.h
+++ b/lustre/quota/quota_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index c9249ca..3ad5ee0 100644 (file)
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index a3df324..2d53c56 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -25,7 +25,7 @@
 #
 
 #
 #
 
 #

-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.

 # Use is subject to license terms.
 #
 
 # Use is subject to license terms.
 #
 

diff --git a/lustre/tests/copytool.c b/lustre/tests/copytool.c
index 8bacd55..b67a632 100644 (file)
--- a/lustre/tests/copytool.c
+++ b/lustre/tests/copytool.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/tests/mpi/mdsrate.c b/lustre/tests/mpi/mdsrate.c
index ce49e30..ffd7dd1 100644 (file)
--- a/lustre/tests/mpi/mdsrate.c
+++ b/lustre/tests/mpi/mdsrate.c
@@ -8,7 +8,7 @@
  */
 
 /*
  */
 
 /*

- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 
  * Use is subject to license terms.
  */
 

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index f180147..926a1af 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index c069f9f..bb055c5 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index e28f533..7224c5a 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/ll_decode_filter_fid.c b/lustre/utils/ll_decode_filter_fid.c
index c7e2c63..a5e11a2 100644 (file)
--- a/lustre/utils/ll_decode_filter_fid.c
+++ b/lustre/utils/ll_decode_filter_fid.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/ll_recover_lost_found_objs.c b/lustre/utils/ll_recover_lost_found_objs.c
index 8af6dfa..4ac685d 100644 (file)
--- a/lustre/utils/ll_recover_lost_found_objs.c
+++ b/lustre/utils/ll_recover_lost_found_objs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/llverdev.c b/lustre/utils/llverdev.c
index 58641f2..67babe4 100644 (file)
--- a/lustre/utils/llverdev.c
+++ b/lustre/utils/llverdev.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c
index 6d7a85d..d885dd4 100644 (file)
--- a/lustre/utils/llverfs.c
+++ b/lustre/utils/llverfs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/loadgen.c b/lustre/utils/loadgen.c
index 83585a3..e6cf984 100644 (file)
--- a/lustre/utils/loadgen.c
+++ b/lustre/utils/loadgen.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 9079242..b2ed7e9 100644 (file)
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/lustre_rsync.c b/lustre/utils/lustre_rsync.c
index 67b53ff..a3c9029 100644 (file)
--- a/lustre/utils/lustre_rsync.c
+++ b/lustre/utils/lustre_rsync.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2009 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 6024c74..c4fc9ff 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index ceb1436..24b042c 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index a0b702c..8a6ec94 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 1af633e..7a1a333 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index aac3c87..c553509 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*