projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From: Tiger Yang <tiger.yang@oracle.com> |
| 2 | Date: Thu, 23 Oct 2008 16:33:03 +0800 | |
| 3 | Subject: ocfs2: fix license in xattr | |
| 4 | ||
| 5 | This patch fixes the license in xattr.c and xattr.h. | |
| 6 | ||
| 7 | Signed-off-by: Tiger Yang <tiger.yang@oracle.com> | |
| 8 | Signed-off-by: Joel Becker <joel.becker@oracle.com> | |
| 9 | Signed-off-by: Mark Fasheh <mfasheh@suse.com> | |
| 10 | --- | |
| 11 | fs/ocfs2/xattr.c | 13 ++++--------- | |
| 12 | fs/ocfs2/xattr.h | 12 ++---------- | |
| 13 | 2 files changed, 6 insertions(+), 19 deletions(-) | |
| 14 | ||
| 15 | diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c | |
| 16 | index 802c414..2f8952e 100644 | |
| 17 | --- a/fs/ocfs2/xattr.c | |
| 18 | +++ b/fs/ocfs2/xattr.c | |
| 19 | @@ -3,25 +3,20 @@ | |
| 20 | * | |
| 21 | * xattr.c | |
| 22 | * | |
| 23 | - * Copyright (C) 2008 Oracle. All rights reserved. | |
| 24 | + * Copyright (C) 2004, 2008 Oracle. All rights reserved. | |
| 25 | * | |
| 26 | * CREDITS: | |
| 27 | - * Lots of code in this file is taken from ext3. | |
| 28 | + * Lots of code in this file is copy from linux/fs/ext3/xattr.c. | |
| 29 | + * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de> | |
| 30 | * | |
| 31 | * This program is free software; you can redistribute it and/or | |
| 32 | * modify it under the terms of the GNU General Public | |
| 33 | - * License as published by the Free Software Foundation; either | |
| 34 | - * version 2 of the License, or (at your option) any later version. | |
| 35 | + * License version 2 as published by the Free Software Foundation. | |
| 36 | * | |
| 37 | * This program is distributed in the hope that it will be useful, | |
| 38 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 39 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 40 | * General Public License for more details. | |
| 41 | - * | |
| 42 | - * You should have received a copy of the GNU General Public | |
| 43 | - * License along with this program; if not, write to the | |
| 44 | - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 45 | - * Boston, MA 021110-1307, USA. | |
| 46 | */ | |
| 47 | ||
| 48 | #include <linux/capability.h> | |
| 49 | diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h | |
| 50 | index c25c7c6..e4e45c8 100644 | |
| 51 | --- a/fs/ocfs2/xattr.h | |
| 52 | +++ b/fs/ocfs2/xattr.h | |
| 53 | @@ -3,24 +3,16 @@ | |
| 54 | * | |
| 55 | * xattr.h | |
| 56 | * | |
| 57 | - * Function prototypes | |
| 58 | - * | |
| 59 | - * Copyright (C) 2008 Oracle. All rights reserved. | |
| 60 | + * Copyright (C) 2004, 2008 Oracle. All rights reserved. | |
| 61 | * | |
| 62 | * This program is free software; you can redistribute it and/or | |
| 63 | * modify it under the terms of the GNU General Public | |
| 64 | - * License as published by the Free Software Foundation; either | |
| 65 | - * version 2 of the License, or (at your option) any later version. | |
| 66 | + * License version 2 as published by the Free Software Foundation. | |
| 67 | * | |
| 68 | * This program is distributed in the hope that it will be useful, | |
| 69 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 70 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 71 | * General Public License for more details. | |
| 72 | - * | |
| 73 | - * You should have received a copy of the GNU General Public | |
| 74 | - * License along with this program; if not, write to the | |
| 75 | - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 76 | - * Boston, MA 021110-1307, USA. | |
| 77 | */ | |
| 78 | ||
| 79 | #ifndef OCFS2_XATTR_H | |
| 80 | -- | |
| 81 | 1.5.6 | |
| 82 |