1 files changed, 15 insertions, 31 deletions
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index dcd3fdd5c1f7..d7b6b5d16704 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -1,51 +1,35 @@
 /*
- * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
 *
- * This program is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or
- * under the terms of version 2 of the GNU General Public License as
+ * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation.
 *
- * This program is distributed in the hope that it would be useful, but
+ * This program is distributed in the hope that it would be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
 *
- * Further, this software is distributed without any warranty that it is
+ * You should have received a copy of the GNU General Public License
- * free of the rightful claim of any third person regarding infringement
+ * along with this program; if not, write the Free Software Foundation,
- * or the like.  Any license provided herein, whether implied or
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
 */
 #include "xfs.h"
+#include "xfs_fs.h"
-#include "xfs_macros.h"
 #include "xfs_types.h"
-#include "xfs_inum.h"
 #include "xfs_log.h"
-#include "xfs_sb.h"
+#include "xfs_inum.h"
 #include "xfs_trans.h"
+#include "xfs_sb.h"
 #include "xfs_dir.h"
 #include "xfs_dir2.h"
 #include "xfs_dmapi.h"
 #include "xfs_mount.h"
 #include "xfs_bmap_btree.h"
-#include "xfs_attr_sf.h"
 #include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
+#include "xfs_attr_sf.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
 #include "xfs_utils.h"

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index dcd3fdd5c1f7..d7b6b5d16704 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c
@@ -1,51 +1,35 @@
1	/*	1	/*
2	* Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved.	2	* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
		3	* All Rights Reserved.
3	*	4	*
4	* This program is free software; you can redistribute it and/or modify it	5	* This program is free software; you can redistribute it and/or
5	* under the terms of version 2 of the GNU General Public License as	6	* modify it under the terms of the GNU General Public License as
6	* published by the Free Software Foundation.	7	* published by the Free Software Foundation.
7	*	8	*
8	* This program is distributed in the hope that it would be useful, but	9	* This program is distributed in the hope that it would be useful,
9	* WITHOUT ANY WARRANTY; without even the implied warranty of	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	* GNU General Public License for more details.
11	*	13	*
12	* Further, this software is distributed without any warranty that it is	14	* You should have received a copy of the GNU General Public License
13	* free of the rightful claim of any third person regarding infringement	15	* along with this program; if not, write the Free Software Foundation,
14	* or the like. Any license provided herein, whether implied or	16	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15	* otherwise, applies only to this software file. Patent licenses, if
16	* any, provided herein do not apply to combinations of this program with
17	* other software, or any other product whatsoever.
18	*
19	* You should have received a copy of the GNU General Public License along
20	* with this program; if not, write the Free Software Foundation, Inc., 59
21	* Temple Place - Suite 330, Boston MA 02111-1307, USA.
22	*
23	* Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
24	* Mountain View, CA 94043, or:
25	*
26	* http://www.sgi.com
27	*
28	* For further information regarding this notice, see:
29	*
30	* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
31	*/	17	*/
32
33	#include "xfs.h"	18	#include "xfs.h"
34		19	#include "xfs_fs.h"
35	#include "xfs_macros.h"
36	#include "xfs_types.h"	20	#include "xfs_types.h"
37	#include "xfs_inum.h"
38	#include "xfs_log.h"	21	#include "xfs_log.h"
39	#include "xfs_sb.h"	22	#include "xfs_inum.h"
40	#include "xfs_trans.h"	23	#include "xfs_trans.h"
		24	#include "xfs_sb.h"
41	#include "xfs_dir.h"	25	#include "xfs_dir.h"
42	#include "xfs_dir2.h"	26	#include "xfs_dir2.h"
43	#include "xfs_dmapi.h"	27	#include "xfs_dmapi.h"
44	#include "xfs_mount.h"	28	#include "xfs_mount.h"
45	#include "xfs_bmap_btree.h"	29	#include "xfs_bmap_btree.h"
46	#include "xfs_attr_sf.h"
47	#include "xfs_dir_sf.h"	30	#include "xfs_dir_sf.h"
48	#include "xfs_dir2_sf.h"	31	#include "xfs_dir2_sf.h"
		32	#include "xfs_attr_sf.h"
49	#include "xfs_dinode.h"	33	#include "xfs_dinode.h"
50	#include "xfs_inode.h"	34	#include "xfs_inode.h"
51	#include "xfs_utils.h"	35	#include "xfs_utils.h"