From 86f961b310e7501d76e5d587a4b416169785e156 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf <behlendorf1@llnl.gov> Date: Tue, 18 May 2010 14:18:09 -0700 Subject: [PATCH] Update all zpios related headers for consistency and correctness. --- cmd/zpios/zpios.h | 51 ++++++++++++------------- cmd/zpios/zpios_main.c | 54 +++++++++++++-------------- cmd/zpios/zpios_util.c | 54 +++++++++++++-------------- module/zpios/include/zpios-ctl.h | 51 ++++++++++++------------- module/zpios/include/zpios-internal.h | 51 ++++++++++++------------- module/zpios/zpios.c | 54 +++++++++++++-------------- 6 files changed, 156 insertions(+), 159 deletions(-) diff --git a/cmd/zpios/zpios.h b/cmd/zpios/zpios.h index d88af0b040..ed979459af 100644 --- a/cmd/zpios/zpios.h +++ b/cmd/zpios/zpios.h @@ -1,34 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #ifndef _ZPIOS_H #define _ZPIOS_H diff --git a/cmd/zpios/zpios_main.c b/cmd/zpios/zpios_main.c index f774682ac8..14c37e7e36 100644 --- a/cmd/zpios/zpios_main.c +++ b/cmd/zpios/zpios_main.c @@ -1,37 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - * - * Kernel PIOS DMU implemenation originally derived from PIOS test code. - * Character control interface derived from SPL code. - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #include <stdlib.h> #include <stdio.h> diff --git a/cmd/zpios/zpios_util.c b/cmd/zpios/zpios_util.c index e42d06f111..48a0a469ff 100644 --- a/cmd/zpios/zpios_util.c +++ b/cmd/zpios/zpios_util.c @@ -1,37 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - * - * Kernel PIOS DMU implemenation originally derived from PIOS test code. - * Character control interface derived from SPL code. - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #include <stdlib.h> #include <stdio.h> diff --git a/module/zpios/include/zpios-ctl.h b/module/zpios/include/zpios-ctl.h index 3880f7794b..234e96c11d 100644 --- a/module/zpios/include/zpios-ctl.h +++ b/module/zpios/include/zpios-ctl.h @@ -1,34 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #ifndef _ZPIOS_CTL_H #define _ZPIOS_CTL_H diff --git a/module/zpios/include/zpios-internal.h b/module/zpios/include/zpios-internal.h index cafe8b7d09..c9b6e00924 100644 --- a/module/zpios/include/zpios-internal.h +++ b/module/zpios/include/zpios-internal.h @@ -1,34 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #ifndef _ZPIOS_INTERNAL_H #define _ZPIOS_INTERNAL_H diff --git a/module/zpios/zpios.c b/module/zpios/zpios.c index f198946d21..89b3f34696 100644 --- a/module/zpios/zpios.c +++ b/module/zpios/zpios.c @@ -1,37 +1,35 @@ -/* - * This file is part of the ZFS Linux port. +/*****************************************************************************\ + * ZPIOS is a heavily modified version of the original PIOS test code. + * It is designed to have the test code running in the Linux kernel + * against ZFS while still being flexibly controled from user space. * - * Copyright (c) 2008 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory - * Written by: - * Brian Behlendorf <behlendorf1@llnl.gov>, - * Herb Wartens <wartens2@llnl.gov>, - * Jim Garlick <garlick@llnl.gov> - * LLNL-CODE-403049 + * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf <behlendorf1@llnl.gov>. + * LLNL-CODE-403049 * - * CDDL HEADER START + * Original PIOS Test Code + * Copyright (C) 2004 Cluster File Systems, Inc. + * Written by Peter Braam <braam@clusterfs.com> + * Atul Vidwansa <atul@clusterfs.com> + * Milind Dumbare <milind@clusterfs.com> * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * This file is part of ZFS on Linux. + * For details, see <http://github.com/behlendorf/zfs/>. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * ZPIOS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * ZPIOS is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. * - * CDDL HEADER END - * - * Kernel PIOS DMU implementation originally derived from PIOS test code. - * Character control interface derived from SPL code. - */ + * You should have received a copy of the GNU General Public License along + * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. +\*****************************************************************************/ #include <sys/zfs_context.h> #include <sys/dmu.h>