From: kalpak Date: Sat, 26 Jul 2008 10:38:40 +0000 (+0000) Subject: b=16098 X-Git-Tag: v1_9_50~1^3~7 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a6803219efba314c58a5cfa3f4bc6a45db99fbee;p=fs%2Flustre-release.git b=16098 Change licenses in ldiskfs patches --- diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch index ea69e84..9a1c521 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch @@ -4,7 +4,7 @@ Index: linux-2.6.16.21-0.8/fs/ext3/extents.c +++ linux-2.6.16.21-0.8/fs/ext3/extents.c @@ -0,0 +1,2359 @@ +/* -+ * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify @@ -2671,7 +2671,7 @@ Index: linux-2.6.16.21-0.8/include/linux/ext3_extents.h +++ linux-2.6.16.21-0.8/include/linux/ext3_extents.h @@ -0,0 +1,262 @@ +/* -+ * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch index 6289f1b..f1f94f2 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch @@ -4,7 +4,7 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/extents.c +++ linux-2.6.16.54-0.2.5/fs/ext3/extents.c @@ -0,0 +1,2264 @@ +/* -+ * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify @@ -2549,7 +2549,7 @@ Index: linux-2.6.16.54-0.2.5/include/linux/ext3_extents.h +++ linux-2.6.16.54-0.2.5/include/linux/ext3_extents.h @@ -0,0 +1,262 @@ +/* -+ * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch index 1151e45..1f00d9e 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch @@ -18,7 +18,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c +++ linux-2.6.18.8/fs/ext3/extents.c 2007-07-17 11:08:59.000000000 +0200 @@ -0,0 +1,2276 @@ +/* -+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008, Sun Microsystems, Inc. + * Written by Alex Tomas + * + * Architecture independence: @@ -2490,7 +2490,7 @@ Index: linux-2.6.18.8/include/linux/ext3_extents.h +++ linux-2.6.18.8/include/linux/ext3_extents.h 2007-07-17 09:18:14.000000000 +0200 @@ -0,0 +1,231 @@ +/* -+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch index aa88a2f..ffd1923 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch @@ -18,7 +18,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c +++ linux-2.6.18.8/fs/ext3/extents.c 2007-07-17 11:08:59.000000000 +0200 @@ -0,0 +1,2276 @@ +/* -+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * Architecture independence: @@ -2491,7 +2491,7 @@ Index: linux-2.6.18.8/include/linux/ext3_extents.h +++ linux-2.6.18.8/include/linux/ext3_extents.h 2007-07-17 09:18:14.000000000 +0200 @@ -0,0 +1,231 @@ +/* -+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch index 67d6236..d0d4d89 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch @@ -4,7 +4,7 @@ Index: linux-stage/fs/ext3/extents.c +++ linux-stage/fs/ext3/extents.c 2005-02-25 15:33:48.917194056 +0200 @@ -0,0 +1,2360 @@ +/* -+ * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify @@ -2650,7 +2650,7 @@ Index: linux-stage/include/linux/ext3_extents.h +++ linux-stage/include/linux/ext3_extents.h 2005-02-25 15:33:48.944189952 +0200 @@ -0,0 +1,262 @@ +/* -+ * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008, Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch index 101d983..5695c70 100644 --- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch @@ -292,7 +292,7 @@ Index: linux-2.6.18/fs/ext3/fiemap.h +/* + * linux/fs/ext3/fiemap.h + * -+ * Copyright (C) 2007 Cluster File Systems, Inc ++ * Copyright 2008 Sun Microsystems, Inc. + * + * Author: Kalpak Shah + */ diff --git a/ldiskfs/kernel_patches/patches/ext3-iam-common.patch b/ldiskfs/kernel_patches/patches/ext3-iam-common.patch index 4633d88..98f3e50 100644 --- a/ldiskfs/kernel_patches/patches/ext3-iam-common.patch +++ b/ldiskfs/kernel_patches/patches/ext3-iam-common.patch @@ -1,34 +1,48 @@ -Index: linux-stage/fs/ext3/iam_lvar.c +Index: linux-2.6.22.14/fs/ext3/iam_lvar.c =================================================================== ---- linux-stage.orig/fs/ext3/iam_lvar.c 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/fs/ext3/iam_lvar.c 2007-10-21 17:32:18.000000000 +0300 -@@ -0,0 +1,1077 @@ +--- /dev/null ++++ linux-2.6.22.14/fs/ext3/iam_lvar.c +@@ -0,0 +1,1091 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * iam_lvar.c -+ * implementation of iam format for fixed size records, variable sized keys. ++ * GPL HEADER START + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Nikita Danilov ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ * ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. ++ * ++ * iam_lvar.c ++ * ++ * implementation of iam format for fixed size records, variable sized keys. ++ * ++ * Author: Nikita Danilov + */ + +#include @@ -1080,38 +1094,51 @@ Index: linux-stage/fs/ext3/iam_lvar.c + iam_format_register(&lvar_format); +} + -Index: linux-stage/fs/ext3/iam_lfix.c +Index: linux-2.6.22.14/fs/ext3/iam_lfix.c =================================================================== ---- linux-stage.orig/fs/ext3/iam_lfix.c 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/fs/ext3/iam_lfix.c 2007-10-21 17:32:18.000000000 +0300 -@@ -0,0 +1,732 @@ +--- /dev/null ++++ linux-2.6.22.14/fs/ext3/iam_lfix.c +@@ -0,0 +1,745 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * iam_lfix.c -+ * implementation of iam format for fixed size records. ++ * GPL HEADER START ++ * ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. ++ * ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Wang Di -+ * Author: Nikita Danilov ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * iam_lfix.c ++ * implementation of iam format for fixed size records. + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * Author: Wang Di ++ * Author: Nikita Danilov + */ + +#include @@ -1817,37 +1844,50 @@ Index: linux-stage/fs/ext3/iam_lfix.c + char rec[RECSIZE]; + } ll_entry[LFIX_LEAF_RECNO]; +}; -Index: linux-stage/fs/ext3/iam_htree.c +Index: linux-2.6.22.14/fs/ext3/iam_htree.c =================================================================== ---- linux-stage.orig/fs/ext3/iam_htree.c 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/fs/ext3/iam_htree.c 2007-10-21 17:32:18.000000000 +0300 -@@ -0,0 +1,685 @@ +--- /dev/null ++++ linux-2.6.22.14/fs/ext3/iam_htree.c +@@ -0,0 +1,698 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * iam_htree.c -+ * implementation of iam format for ext3/htree. ++ * GPL HEADER START ++ * ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Nikita Danilov ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ * ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * iam_htree.c ++ * implementation of iam format for ext3/htree. + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * Author: Nikita Danilov + */ + +#include @@ -2507,38 +2547,51 @@ Index: linux-stage/fs/ext3/iam_htree.c +{ + iam_format_register(&iam_htree_format); +} -Index: linux-stage/fs/ext3/iam.c +Index: linux-2.6.22.14/fs/ext3/iam.c =================================================================== ---- linux-stage.orig/fs/ext3/iam.c 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/fs/ext3/iam.c 2007-10-21 17:32:18.000000000 +0300 -@@ -0,0 +1,1433 @@ +--- /dev/null ++++ linux-2.6.22.14/fs/ext3/iam.c +@@ -0,0 +1,1446 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * iam.c -+ * Top-level entry points into iam module ++ * GPL HEADER START + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Wang Di -+ * Author: Nikita Danilov ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ * ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. ++ * ++ * iam.c ++ * Top-level entry points into iam module ++ * ++ * Author: Wang Di ++ * Author: Nikita Danilov + */ + +/* @@ -3945,37 +3998,50 @@ Index: linux-stage/fs/ext3/iam.c +} +EXPORT_SYMBOL(iam_delete); + -Index: linux-stage/fs/ext3/iam-uapi.c +Index: linux-2.6.22.14/fs/ext3/iam-uapi.c =================================================================== ---- linux-stage.orig/fs/ext3/iam-uapi.c 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/fs/ext3/iam-uapi.c 2007-10-21 17:32:28.000000000 +0300 -@@ -0,0 +1,367 @@ +--- /dev/null ++++ linux-2.6.22.14/fs/ext3/iam-uapi.c +@@ -0,0 +1,380 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * iam_uapi.c -+ * User-level interface to iam (ioctl based) ++ * GPL HEADER START ++ * ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Nikita Danilov ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. ++ * ++ * iam_uapi.c ++ * User-level interface to iam (ioctl based) ++ * ++ * Author: Nikita Danilov + */ + +#include @@ -4317,38 +4383,51 @@ Index: linux-stage/fs/ext3/iam-uapi.c + result = -ENOENT; + return result; +} -Index: linux-stage/include/linux/lustre_iam.h +Index: linux-2.6.22.14/include/linux/lustre_iam.h =================================================================== ---- linux-stage.orig/include/linux/lustre_iam.h 2006-06-16 16:07:58.000000000 +0300 -+++ linux-stage/include/linux/lustre_iam.h 2007-10-21 17:42:58.000000000 +0300 -@@ -0,0 +1,1074 @@ +--- /dev/null ++++ linux-2.6.22.14/include/linux/lustre_iam.h +@@ -0,0 +1,1087 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * -+ * lustre_iam.c -+ * Top-level entry points into osd module ++ * GPL HEADER START ++ * ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 only, ++ * as published by the Free Software Foundation. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. -+ * Author: Wang Di -+ * Author: Nikita Danilov ++ * This program 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 version 2 for more details (a copy is included ++ * in the LICENSE file that accompanied this code). + * -+ * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * You should have received a copy of the GNU General Public License ++ * version 2 along with this program; If not, see [sun.com URL with a ++ * copy of GPLv2]. + * -+ * You may have signed or agreed to another license before downloading -+ * this software. If so, you are bound by the terms and conditions -+ * of that agreement, and the following does not apply to you. See the -+ * LICENSE file included with this distribution for more information. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ * ++ * GPL HEADER END ++ */ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All rights reserved ++ * Use is subject to license terms. ++ */ ++/* ++ * This file is part of Lustre, http://www.lustre.org/ ++ * Lustre is a trademark of Sun Microsystems, Inc. + * -+ * If you did not agree to a different license, then this copy of Lustre -+ * is open source software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. ++ * lustre_iam.c ++ * Top-level entry points into osd module + * -+ * In either case, Lustre 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 -+ * license text for more details. ++ * Author: Wang Di ++ * Author: Nikita Danilov + */ + +#ifndef __LINUX_LUSTRE_IAM_H__ diff --git a/ldiskfs/kernel_patches/patches/ext3-iam-separate.patch b/ldiskfs/kernel_patches/patches/ext3-iam-separate.patch index 3b92a3e..7924c38 100644 --- a/ldiskfs/kernel_patches/patches/ext3-iam-separate.patch +++ b/ldiskfs/kernel_patches/patches/ext3-iam-separate.patch @@ -9,11 +9,11 @@ Index: linux-stage/fs/ext3/iam_lvar.c + * iam_lvar.c + * implementation of iam format for fixed size records, variable sized keys. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions @@ -1104,12 +1104,12 @@ Index: linux-stage/fs/ext3/iam_lfix.c + * iam_lfix.c + * implementation of iam format for fixed size records. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Wang Di + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions @@ -1841,11 +1841,11 @@ Index: linux-stage/fs/ext3/iam_htree.c + * iam_htree.c + * implementation of iam format for ext3/htree. + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions @@ -4574,12 +4574,12 @@ Index: linux-stage/fs/ext3/iam.c + * iam.c + * Top-level entry points into iam module + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Wang Di + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions @@ -6012,12 +6012,12 @@ Index: linux-stage/include/linux/lustre_iam.h + * lustre_iam.c + * Top-level entry points into osd module + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Wang Di + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions diff --git a/ldiskfs/kernel_patches/patches/ext3-iam-uapi.patch b/ldiskfs/kernel_patches/patches/ext3-iam-uapi.patch index adc4451..4a4197e 100644 --- a/ldiskfs/kernel_patches/patches/ext3-iam-uapi.patch +++ b/ldiskfs/kernel_patches/patches/ext3-iam-uapi.patch @@ -22,11 +22,11 @@ Index: linux-stage/fs/ext3/iam-uapi.c + * iam_uapi.c + * User-level interface to iam (ioctl based) + * -+ * Copyright (c) 2006 Cluster File Systems, Inc. ++ * Copyright 2008 Sun Microsystems, Inc. + * Author: Nikita Danilov + * + * This file is part of the Lustre file system, http://www.lustre.org -+ * Lustre is a trademark of Cluster File Systems, Inc. ++ * Lustre is a trademark of Sun Microsystems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch index 35a9666..409e950 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch @@ -364,7 +364,7 @@ Index: linux-2.6.16.i686/fs/ext3/mballoc.c +++ linux-2.6.16.i686/fs/ext3/mballoc.c 2006-05-30 23:03:38.000000000 +0800 @@ -0,0 +1,2726 @@ +/* -+ * Copyright (c) 2003-2005, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008, Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch index ebebbcf..09d3438 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch @@ -382,7 +382,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.c +++ linux-2.6.9-full/fs/ext3/mballoc.c 2006-10-24 13:00:56.000000000 +0400 @@ -0,0 +1,2726 @@ +/* -+ * Copyright (c) 2003-2005, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch index f4da14e..bda2917 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch @@ -261,7 +261,7 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/mballoc.c +++ linux-2.6.16.54-0.2.5/fs/ext3/mballoc.c @@ -0,0 +1,4385 @@ +/* -+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com ++ * Copyright 2008 Sun Microsystems, Inc. + * Written by Alex Tomas + * + * This program is free software; you can redistribute it and/or modify diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch index 709a0fd..7436b75 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch @@ -224,7 +224,7 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/group.h +/* + * linux/fs/ext3/group.h + * -+ * Copyright (C) 2007 Cluster File Systems, Inc ++ * Copyright 2008 Sun Microsystems, Inc. + * + * Author: Andreas Dilger + */ diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch index 7e9b839..0a463dc 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch @@ -225,7 +225,7 @@ Index: linux-2.6.18-53.1.19/fs/ext3/group.h +/* + * linux/fs/ext3/group.h + * -+ * Copyright (C) 2007 Cluster File Systems, Inc ++ * Copyright 2008 Sun Microsystems, Inc. + * + * Author: Andreas Dilger + */ diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22-vanilla.patch index 1fb9c00..c4fa59e 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22-vanilla.patch @@ -225,7 +225,7 @@ Index: linux-2.6.22.14/fs/ext3/group.h +/* + * linux/fs/ext3/group.h + * -+ * Copyright (C) 2007 Cluster File Systems, Inc ++ * Copyright 2008 Sun Microsystems, Inc. + * + * Author: Andreas Dilger + */ diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch index b956664..e2307ac 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch @@ -198,7 +198,7 @@ Index: linux-2.6.9-full/fs/ext3/group.h +/* + * linux/fs/ext3/group.h + * -+ * Copyright (C) 2007 Cluster File Systems, Inc ++ * Copyright 2008 Sun Microsystems, Inc. + * + * Author: Andreas Dilger + */