Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2010-05-18 14:23:11 -07:00
parent 424feaa1c9 8f44115907
commit 50a92e7f30
6 changed files with 156 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cmd/zpios/zpios.h
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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 #ifndef _ZPIOS_H
#define _ZPIOS_H #define _ZPIOS_H

54
cmd/zpios/zpios_main.c
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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/>.
* Kernel PIOS DMU implemenation originally derived from PIOS test code. \*****************************************************************************/
* Character control interface derived from SPL code.
*/
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

54
cmd/zpios/zpios_util.c
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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/>.
* Kernel PIOS DMU implemenation originally derived from PIOS test code. \*****************************************************************************/
* Character control interface derived from SPL code.
*/
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

51
module/zpios/include/zpios-ctl.h
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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 #ifndef _ZPIOS_CTL_H
#define _ZPIOS_CTL_H #define _ZPIOS_CTL_H

51
module/zpios/include/zpios-internal.h
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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 #ifndef _ZPIOS_INTERNAL_H
#define _ZPIOS_INTERNAL_H #define _ZPIOS_INTERNAL_H

54
module/zpios/zpios.c
View File

@ -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. * Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by: * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* Brian Behlendorf <behlendorf1@llnl.gov>, * LLNL-CODE-403049
* Herb Wartens <wartens2@llnl.gov>,
* Jim Garlick <garlick@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 * This file is part of ZFS on Linux.
* Common Development and Distribution License, Version 1.0 only * For details, see <http://github.com/behlendorf/zfs/>.
* (the "License"). You may not use this file except in compliance
* with the License.
* *
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * ZPIOS is free software; you can redistribute it and/or modify it
* or http://www.opensolaris.org/os/licensing. * under the terms of the GNU General Public License as published by the
* See the License for the specific language governing permissions * Free Software Foundation; either version 2 of the License, or (at your
* and limitations under the License. * option) any later version.
* *
* When distributing Covered Code, include this CDDL HEADER in each * ZPIOS is distributed in the hope that it will be useful, but WITHOUT
* file and include the License file at usr/src/OPENSOLARIS.LICENSE. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* If applicable, add the following below this CDDL HEADER, with the * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* fields enclosed by brackets "[]" replaced with your own identifying * for more details.
* information: Portions Copyright [yyyy] [name of copyright owner]
* *
* 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/>.
* Kernel PIOS DMU implementation originally derived from PIOS test code. \*****************************************************************************/
* Character control interface derived from SPL code.
*/
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/dmu.h> #include <sys/dmu.h>