157 files changed, 1762 insertions, 4056 deletions
diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c
index 3c92162dc728..1b4b91cb6963 100644
--- a/fs/xfs/linux-2.6/kmem.c
+++ b/fs/xfs/linux-2.6/kmem.c
@@ -1,42 +1,26 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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 <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
 #include <linux/swap.h>
 #include <linux/blkdev.h>
 #include "time.h"
 #include "kmem.h"
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index f4bb78c268c0..de4a60d9676d 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_SUPPORT_KMEM_H__
 #define __XFS_SUPPORT_KMEM_H__
diff --git a/fs/xfs/linux-2.6/mrlock.h b/fs/xfs/linux-2.6/mrlock.h
index d2c11a098ff2..16b44c3c2362 100644
--- a/fs/xfs/linux-2.6/mrlock.h
+++ b/fs/xfs/linux-2.6/mrlock.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_SUPPORT_MRLOCK_H__
 #define __XFS_SUPPORT_MRLOCK_H__
diff --git a/fs/xfs/linux-2.6/mutex.h b/fs/xfs/linux-2.6/mutex.h
index 0b296bb944cb..ce773d89a923 100644
--- a/fs/xfs/linux-2.6/mutex.h
+++ b/fs/xfs/linux-2.6/mutex.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_SUPPORT_MUTEX_H__
 #define __XFS_SUPPORT_MUTEX_H__
diff --git a/fs/xfs/linux-2.6/sema.h b/fs/xfs/linux-2.6/sema.h
index 30b67b4e1cbf..194a84490bd1 100644
--- a/fs/xfs/linux-2.6/sema.h
+++ b/fs/xfs/linux-2.6/sema.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_SUPPORT_SEMA_H__
 #define __XFS_SUPPORT_SEMA_H__
diff --git a/fs/xfs/linux-2.6/spin.h b/fs/xfs/linux-2.6/spin.h
index 0039504069a5..50a6191178f4 100644
--- a/fs/xfs/linux-2.6/spin.h
+++ b/fs/xfs/linux-2.6/spin.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_SUPPORT_SPIN_H__
 #define __XFS_SUPPORT_SPIN_H__
diff --git a/fs/xfs/linux-2.6/sv.h b/fs/xfs/linux-2.6/sv.h
index 821d3167e05b..9a8ad481b008 100644
--- a/fs/xfs/linux-2.6/sv.h
+++ b/fs/xfs/linux-2.6/sv.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_SUPPORT_SV_H__
 #define __XFS_SUPPORT_SV_H__
diff --git a/fs/xfs/linux-2.6/time.h b/fs/xfs/linux-2.6/time.h
index b0d2873ab274..387e695a184c 100644
--- a/fs/xfs/linux-2.6/time.h
+++ b/fs/xfs/linux-2.6/time.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_SUPPORT_TIME_H__
 #define __XFS_SUPPORT_TIME_H__
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 8c05c3c30741..26c346d9de51 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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_bit.h"
diff --git a/fs/xfs/linux-2.6/xfs_aops.h b/fs/xfs/linux-2.6/xfs_aops.h
index 2fa62974a04d..4720758a9ade 100644
--- a/fs/xfs/linux-2.6/xfs_aops.h
+++ b/fs/xfs/linux-2.6/xfs_aops.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 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/
 */
 #ifndef __XFS_AOPS_H__
 #define __XFS_AOPS_H__
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 660c24acb640..e22cce1a9d5d 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1,46 +1,20 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
-/*
- *      The xfs_buf.c code provides an abstract buffer cache model on top
- *      of the Linux page cache.  Cached metadata blocks for a file system
- *      are hashed to the inode for the block device.  xfs_buf.c assembles
- *      buffers (xfs_buf_t) on demand to aggregate such cached pages for I/O.
- *
- *      Written by Steve Lord, Jim Mostek, Russell Cattelan
- *                  and Rajagopal Ananthanarayanan ("ananth") at SGI.
- *
- */
 #include <linux/stddef.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
@@ -55,13 +29,8 @@
 #include <linux/blkdev.h>
 #include <linux/hash.h>
 #include <linux/kthread.h>
 #include "xfs_linux.h"
-/*
- * File wide globals
- */
 STATIC kmem_cache_t *pagebuf_zone;
 STATIC kmem_shaker_t pagebuf_shake;
 STATIC int xfsbufd_wakeup(int, gfp_t);
@@ -70,10 +39,6 @@ STATIC void pagebuf_delwri_queue(xfs_buf_t *, int);
 STATIC struct workqueue_struct *xfslogd_workqueue;
 struct workqueue_struct *xfsdatad_workqueue;
-/*
- * Pagebuf debugging
- */
 #ifdef PAGEBUF_TRACE
 void
 pagebuf_trace(
@@ -112,10 +77,6 @@ ktrace_t *pagebuf_trace_buf;
 # define PB_GET_OWNER(pb)       do { } while (0)
 #endif
-/*
- * Pagebuf allocation / freeing.
- */
 #define pb_to_gfp(flags) \
        ((((flags) & PBF_READ_AHEAD) ? __GFP_NORETRY : \
          ((flags) & PBF_DONT_BLOCK) ? GFP_NOFS : GFP_KERNEL) | __GFP_NOWARN)
@@ -123,7 +84,6 @@ ktrace_t *pagebuf_trace_buf;
 #define pb_to_km(flags) \
         (((flags) & PBF_DONT_BLOCK) ? KM_NOFS : KM_SLEEP)
 #define pagebuf_allocate(flags) \
        kmem_zone_alloc(pagebuf_zone, pb_to_km(flags))
 #define pagebuf_deallocate(pb) \
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 882901ca7eed..237a35b915d1 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -1,39 +1,20 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
-/*
- * Written by Steve Lord, Jim Mostek, Russell Cattelan at SGI
- */
 #ifndef __XFS_BUF_H__
 #define __XFS_BUF_H__
diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h
index 00c45849d41a..4af491024727 100644
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_CRED_H__
 #define __XFS_CRED_H__
diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index f372a1a5e168..3e97076437be 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-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_types.h"
 #include "xfs_dmapi.h"
@@ -41,7 +26,7 @@
 #include "xfs_export.h"
 /*
- * XFS encode and decodes the fileid portion of NFS filehandles
+ * XFS encodes and decodes the fileid portion of NFS filehandles
 * itself instead of letting the generic NFS code do it.  This
 * allows filesystems with 64 bit inode numbers to be exported.
 *
@@ -51,7 +36,6 @@
 * remains in that code.
 */
 STATIC struct dentry *
 linvfs_decode_fh(
        struct super_block      *sb,
@@ -92,7 +76,7 @@ linvfs_decode_fh(
                p = xfs_fileid_decode_fid2(p, &pfid, is64);
                parent = &pfid;
        }
-        
        fh = (__u32 *)&ifid;
        return find_exported_dentry(sb, fh, parent, acceptable, context);
 }
@@ -113,7 +97,7 @@ linvfs_encode_fh(
 #if XFS_BIG_INUMS
        vfs_t                   *vfs = LINVFS_GET_VFS(inode->i_sb);
        xfs_mount_t             *mp = XFS_VFSTOM(vfs);
-        
        if (!(mp->m_flags & XFS_MOUNT_32BITINOOPT)) {
                /* filesystem may contain 64bit inode numbers */
                is64 = XFS_FILEID_TYPE_64FLAG;
diff --git a/fs/xfs/linux-2.6/xfs_export.h b/fs/xfs/linux-2.6/xfs_export.h
index 60b2abac1c18..e5b0559700a4 100644
--- a/fs/xfs/linux-2.6/xfs_export.h
+++ b/fs/xfs/linux-2.6/xfs_export.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 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/
 */
 #ifndef __XFS_EXPORT_H__
 #define __XFS_EXPORT_H__
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index b0c00eaa79e4..06111d0bbae4 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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_bit.h"
diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index 88134cba5cb0..f89340c61bf2 100644
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.h b/fs/xfs/linux-2.6/xfs_fs_subr.h
index 2db9ddbd4567..aee9ccdd18f7 100644
--- a/fs/xfs/linux-2.6/xfs_fs_subr.h
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.h
@@ -1,48 +1,29 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
- */
-#ifndef __XFS_SUBR_H__
-#define __XFS_SUBR_H__
-/*
- * Utilities shared among file system implementations.
 */
+#ifndef __XFS_FS_SUBR_H__
+#define __XFS_FS_SUBR_H__
 struct cred;
+extern int  fs_noerr(void);
-extern int      fs_noerr(void);
+extern int  fs_nosys(void);
-extern int      fs_nosys(void);
+extern void fs_noval(void);
-extern void     fs_noval(void);
+extern void fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
-extern void     fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
+extern void fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
-extern void     fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
+extern int  fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);
-extern int      fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);
 #endif  /* __XFS_FS_SUBR_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c
index a6da5b4fd240..6e8085f34635 100644
--- a/fs/xfs/linux-2.6/xfs_globals.c
+++ b/fs/xfs/linux-2.6/xfs_globals.c
@@ -1,40 +1,20 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
-/*
- * This file contains globals needed by XFS that were normally defined
- * somewhere else in IRIX.
- */
 #include "xfs.h"
 #include "xfs_cred.h"
 #include "xfs_sysctl.h"
diff --git a/fs/xfs/linux-2.6/xfs_globals.h b/fs/xfs/linux-2.6/xfs_globals.h
index e81e2f38a853..e1a22bfcf865 100644
--- a/fs/xfs/linux-2.6/xfs_globals.h
+++ b/fs/xfs/linux-2.6/xfs_globals.h
@@ -1,42 +1,23 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_GLOBALS_H__
 #define __XFS_GLOBALS_H__
-/*
- * This file declares globals needed by XFS that were normally defined
- * somewhere else in IRIX.
- */
 extern uint64_t xfs_panic_mask;         /* set to cause more panics */
 extern unsigned long xfs_physmem;
 extern struct cred *sys_cred;
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index d880e9c65fcd..b78b5eb9e96c 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
index 4636b7f86f1f..c83ae15bb0e6 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-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 <linux/config.h>
 #include <linux/compat.h>
 #include <linux/init.h>
@@ -39,7 +24,6 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <asm/uaccess.h>
 #include "xfs.h"
 #include "xfs_types.h"
 #include "xfs_fs.h"
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.h b/fs/xfs/linux-2.6/xfs_ioctl32.h
index c874793a1dc9..011c273bec50 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl32.h
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.h
@@ -1,34 +1,24 @@
 /*
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-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/
 */
+#ifndef __XFS_IOCTL32_H__
+#define __XFS_IOCTL32_H__
+extern long linvfs_compat_ioctl(struct file *, unsigned, unsigned long);
+extern long linvfs_compat_invis_ioctl(struct file *f, unsigned, unsigned long);
-long linvfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
+#endif /* __XFS_IOCTL32_H__ */
-long linvfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg);
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 12d2a702c6c3..14215a7db59f 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/linux-2.6/xfs_iops.h b/fs/xfs/linux-2.6/xfs_iops.h
index 415de44b6aed..ee784b63acbf 100644
--- a/fs/xfs/linux-2.6/xfs_iops.h
+++ b/fs/xfs/linux-2.6/xfs_iops.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_IOPS_H__
 #define __XFS_IOPS_H__
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index 29a9f1536fba..52b240539531 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_LINUX__
 #define __XFS_LINUX__
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 36dc8b0368b7..279e9bc92aba 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index 0647e48a8a15..38864a88d42d 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_LRW_H__
 #define __XFS_LRW_H__
diff --git a/fs/xfs/linux-2.6/xfs_stats.c b/fs/xfs/linux-2.6/xfs_stats.c
index aaf5ddba47f3..6c40a74be7c8 100644
--- a/fs/xfs/linux-2.6/xfs_stats.c
+++ b/fs/xfs/linux-2.6/xfs_stats.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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 <linux/proc_fs.h>
diff --git a/fs/xfs/linux-2.6/xfs_stats.h b/fs/xfs/linux-2.6/xfs_stats.h
index 3f756a6c3eb0..50027c4a5618 100644
--- a/fs/xfs/linux-2.6/xfs_stats.h
+++ b/fs/xfs/linux-2.6/xfs_stats.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_STATS_H__
 #define __XFS_STATS_H__
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index fac4862d09a6..6116b5bf433e 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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_bit.h"
diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index ad77e3743e04..df59408dca06 100644
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_SUPER_H__
 #define __XFS_SUPER_H__
diff --git a/fs/xfs/linux-2.6/xfs_sysctl.c b/fs/xfs/linux-2.6/xfs_sysctl.c
index 3dbd57fda2d6..a02564972420 100644
--- a/fs/xfs/linux-2.6/xfs_sysctl.c
+++ b/fs/xfs/linux-2.6/xfs_sysctl.c
@@ -1,42 +1,26 @@
 /*
- * Copyright (c) 2001-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 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 <linux/sysctl.h>
 #include <linux/proc_fs.h>
 static struct ctl_table_header *xfs_table_header;
 #ifdef CONFIG_PROC_FS
 STATIC int
 xfs_stats_clear_proc_handler(
diff --git a/fs/xfs/linux-2.6/xfs_sysctl.h b/fs/xfs/linux-2.6/xfs_sysctl.h
index a39a95020a58..bc8c11f13722 100644
--- a/fs/xfs/linux-2.6/xfs_sysctl.h
+++ b/fs/xfs/linux-2.6/xfs_sysctl.h
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2001-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 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/
 */
 #ifndef __XFS_SYSCTL_H__
 #define __XFS_SYSCTL_H__
diff --git a/fs/xfs/linux-2.6/xfs_version.h b/fs/xfs/linux-2.6/xfs_version.h
index 96f96394417e..f8d279d7563a 100644
--- a/fs/xfs/linux-2.6/xfs_version.h
+++ b/fs/xfs/linux-2.6/xfs_version.h
@@ -1,34 +1,22 @@
 /*
- * Copyright (c) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2001-2002,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/
 */
+#ifndef __XFS_VERSION_H__
+#define __XFS_VERSION_H__
 /*
 * Dummy file that can contain a timestamp to put into the
@@ -36,9 +24,6 @@
 * running
 */
-#ifndef __XFS_VERSION_H__
-#define __XFS_VERSION_H__
 #define XFS_VERSION_STRING "SGI XFS"
 #endif /* __XFS_VERSION_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c
index 1a08a1d84252..c855d62e5344 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.c
+++ b/fs/xfs/linux-2.6/xfs_vfs.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h
index f0ab574fb47a..d5fb28f7d322 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.h
+++ b/fs/xfs/linux-2.6/xfs_vfs.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_VFS_H__
 #define __XFS_VFS_H__
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index 61999649ecef..e9bbcb4d6243 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -1,38 +1,22 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
 uint64_t vn_generation;         /* vnode generation number */
 DEFINE_SPINLOCK(vnumber_lock);
@@ -44,7 +28,6 @@ DEFINE_SPINLOCK(vnumber_lock);
 #define vptosync(v)             (&vsync[((unsigned long)v) % NVSYNC])
 STATIC wait_queue_head_t vsync[NVSYNC];
 void
 vn_init(void)
 {
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index ef1c65f42fe0..407fbe05e3f9 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 *
 * Portions Copyright (c) 1989, 1993
 *      The Regents of the University of California.  All rights reserved.
diff --git a/fs/xfs/quota/Makefile-linux-2.6 b/fs/xfs/quota/Makefile-linux-2.6
index 93e60e839355..bd62dca8515d 100644
--- a/fs/xfs/quota/Makefile-linux-2.6
+++ b/fs/xfs/quota/Makefile-linux-2.6
@@ -1,33 +1,19 @@
 #
-# Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2003,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/
 #
 EXTRA_CFLAGS += -I $(TOPDIR)/fs/xfs -I $(TOPDIR)/fs/xfs/linux-2.6
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index 4e1a5ec22fa3..bb6dc91ea261 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -1,38 +1,22 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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 "debug.h"
 #include "spin.h"
 #include <asm/page.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index 4fbf5fa4d281..aff558664c32 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_SUPPORT_DEBUG_H__
 #define __XFS_SUPPORT_DEBUG_H__
diff --git a/fs/xfs/support/ktrace.c b/fs/xfs/support/ktrace.c
index fa8394f9437d..0ebb872d7da8 100644
--- a/fs/xfs/support/ktrace.c
+++ b/fs/xfs/support/ktrace.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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>
 static kmem_zone_t *ktrace_hdr_zone;
diff --git a/fs/xfs/support/ktrace.h b/fs/xfs/support/ktrace.h
index 92d1a1a5d04b..4c5259a8afb4 100644
--- a/fs/xfs/support/ktrace.h
+++ b/fs/xfs/support/ktrace.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_SUPPORT_KTRACE_H__
 #define __XFS_SUPPORT_KTRACE_H__
diff --git a/fs/xfs/support/move.c b/fs/xfs/support/move.c
index 15b5194f16b2..caefa17b80fe 100644
--- a/fs/xfs/support/move.c
+++ b/fs/xfs/support/move.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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>
 /* Read from kernel buffer at src to user/kernel buffer defined
diff --git a/fs/xfs/support/move.h b/fs/xfs/support/move.h
index 3d406dc1c89e..97a2498d2da3 100644
--- a/fs/xfs/support/move.h
+++ b/fs/xfs/support/move.h
@@ -1,34 +1,20 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
- * 
 * Portions Copyright (c) 1982, 1986, 1993, 1994
 *      The Regents of the University of California.  All rights reserved.
 *
diff --git a/fs/xfs/support/qsort.c b/fs/xfs/support/qsort.c
index 1ec824140cf7..2cb05c7569db 100644
--- a/fs/xfs/support/qsort.c
+++ b/fs/xfs/support/qsort.c
@@ -26,7 +26,6 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 */
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/fs/xfs/support/qsort.h b/fs/xfs/support/qsort.h
index 94263106d716..bce5a78da9a0 100644
--- a/fs/xfs/support/qsort.h
+++ b/fs/xfs/support/qsort.h
@@ -1,41 +1,24 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
+#ifndef __XFS_SUPPORT_QSORT_H__
+#define __XFS_SUPPORT_QSORT_H__
-#ifndef QSORT_H
+extern void qsort(void *const pbase, size_t total_elems, size_t size,
-#define QSORT_H
+                  int (*cmp)(const void *, const void *));
-extern void qsort (void *const pbase,
-                    size_t total_elems,
-                    size_t size,
-                    int (*cmp)(const void *, const void *));
-#endif
+#endif  /* __XFS_SUPPORT_QSORT_H__ */
diff --git a/fs/xfs/support/uuid.c b/fs/xfs/support/uuid.c
index 81f40cfcb267..70ce40914c8a 100644
--- a/fs/xfs/support/uuid.c
+++ b/fs/xfs/support/uuid.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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>
 static mutex_t  uuid_monitor;
diff --git a/fs/xfs/support/uuid.h b/fs/xfs/support/uuid.h
index 5220ea58ba2b..b6f5922199ba 100644
--- a/fs/xfs/support/uuid.h
+++ b/fs/xfs/support/uuid.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_SUPPORT_UUID_H__
 #define __XFS_SUPPORT_UUID_H__
@@ -36,13 +22,13 @@ typedef struct {
        unsigned char   __u_bits[16];
 } uuid_t;
-void uuid_init(void);
+extern void uuid_init(void);
-void uuid_create_nil(uuid_t *uuid);
+extern void uuid_create_nil(uuid_t *uuid);
-int uuid_is_nil(uuid_t *uuid);
+extern int uuid_is_nil(uuid_t *uuid);
-int uuid_equal(uuid_t *uuid1, uuid_t *uuid2);
+extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2);
-void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]);
+extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]);
-__uint64_t uuid_hash64(uuid_t *uuid);
+extern __uint64_t uuid_hash64(uuid_t *uuid);
-int uuid_table_insert(uuid_t *uuid);
+extern int uuid_table_insert(uuid_t *uuid);
-void uuid_table_remove(uuid_t *uuid);
+extern void uuid_table_remove(uuid_t *uuid);
 #endif  /* __XFS_SUPPORT_UUID_H__ */
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index 30c4ab4f9c45..99b50d2bda9b 100644
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -1,37 +1,28 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_H__
 #define __XFS_H__
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux-2.6/xfs_linux.h>
+#else
+#include <linux-2.4/xfs_linux.h>
+#endif
 #endif  /* __XFS_H__ */
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 33c5f402b4ed..571bb3205d50 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2001-2002,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"
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index 0363eb46d357..f9315bc960cb 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2001-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 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/
 */
 #ifndef __XFS_ACL_H__
 #define __XFS_ACL_H__
diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h
index 7d15ef341a90..8d055593fee4 100644
--- a/fs/xfs/xfs_ag.h
+++ b/fs/xfs/xfs_ag.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_AG_H__
 #define __XFS_AG_H__
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index c3a30e14bd13..a439e07253a5 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_alloc.h b/fs/xfs/xfs_alloc.h
index 72329c86351c..3546dea27b7d 100644
--- a/fs/xfs/xfs_alloc.h
+++ b/fs/xfs/xfs_alloc.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_ALLOC_H__
 #define __XFS_ALLOC_H__
diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index ccc421b438ff..1a34b7d99bcd 100644
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -1,33 +1,19 @@
 /*
- * 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"
diff --git a/fs/xfs/xfs_alloc_btree.h b/fs/xfs/xfs_alloc_btree.h
index f857b0f248d3..5615ebba6a3a 100644
--- a/fs/xfs/xfs_alloc_btree.h
+++ b/fs/xfs/xfs_alloc_btree.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_ALLOC_BTREE_H__
 #define __XFS_ALLOC_BTREE_H__
diff --git a/fs/xfs/xfs_arch.h b/fs/xfs/xfs_arch.h
index 5ab0dd885b1b..3191dc60d8db 100644
--- a/fs/xfs/xfs_arch.h
+++ b/fs/xfs/xfs_arch.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_ARCH_H__
 #define __XFS_ARCH_H__
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 7db18e9649df..5484eeb460c8 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -1,35 +1,20 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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_types.h"
diff --git a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h
index 42648b4f75b3..b2c7b9fcded3 100644
--- a/fs/xfs/xfs_attr.h
+++ b/fs/xfs/xfs_attr.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002-2003,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/
 */
 #ifndef __XFS_ATTR_H__
 #define __XFS_ATTR_H__
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index be82014b9522..52a847e6abf7 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_attr_leaf.h b/fs/xfs/xfs_attr_leaf.h
index ef5f5eaa60d0..f6143ff251a0 100644
--- a/fs/xfs/xfs_attr_leaf.h
+++ b/fs/xfs/xfs_attr_leaf.h
@@ -1,34 +1,19 @@
 /*
- * Copyright (c) 2000, 2002-2003, 2005 Silicon Graphics, Inc.
+ * Copyright (c) 2000,2002-2003,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/
 */
 #ifndef __XFS_ATTR_LEAF_H__
 #define __XFS_ATTR_LEAF_H__
diff --git a/fs/xfs/xfs_attr_sf.h b/fs/xfs/xfs_attr_sf.h
index c8001929deab..ffed6ca81a52 100644
--- a/fs/xfs/xfs_attr_sf.h
+++ b/fs/xfs/xfs_attr_sf.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
 */
 #ifndef __XFS_ATTR_SF_H__
 #define __XFS_ATTR_SF_H__
diff --git a/fs/xfs/xfs_behavior.c b/fs/xfs/xfs_behavior.c
index 16088e175ecc..9880adae3938 100644
--- a/fs/xfs/xfs_behavior.c
+++ b/fs/xfs/xfs_behavior.c
@@ -1,34 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * 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/
 *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "xfs.h"
diff --git a/fs/xfs/xfs_behavior.h b/fs/xfs/xfs_behavior.h
index d5ed5a843921..2cd89bb5ab10 100644
--- a/fs/xfs/xfs_behavior.h
+++ b/fs/xfs/xfs_behavior.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_BEHAVIOR_H__
 #define __XFS_BEHAVIOR_H__
diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c
index 76c9ad3875ef..43be6a7e47c6 100644
--- a/fs/xfs/xfs_bit.c
+++ b/fs/xfs/xfs_bit.c
@@ -1,45 +1,29 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
-/*
- * XFS bit manipulation routines, used in non-realtime code.
- */
 #include "xfs.h"
 #include "xfs_bit.h"
 #include "xfs_log.h"
 #include "xfs_trans.h"
 #include "xfs_buf_item.h"
+/*
+ * XFS bit manipulation routines, used in non-realtime code.
+ */
 #ifndef HAVE_ARCH_HIGHBIT
 /*
diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h
index 041e82485064..0bbe56817542 100644
--- a/fs/xfs/xfs_bit.h
+++ b/fs/xfs/xfs_bit.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
 */
 #ifndef __XFS_BIT_H__
 #define __XFS_BIT_H__
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index f8e3357c1e86..82496d901d23 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_bmap.h b/fs/xfs/xfs_bmap.h
index 51a9c82f0f62..2e0717a01309 100644
--- a/fs/xfs/xfs_bmap.h
+++ b/fs/xfs/xfs_bmap.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_BMAP_H__
 #define __XFS_BMAP_H__
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index cc72f77f9824..3bf70eca1638 100644
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_bmap_btree.h b/fs/xfs/xfs_bmap_btree.h
index ff0102d14918..7478b1b1aa2b 100644
--- a/fs/xfs/xfs_bmap_btree.h
+++ b/fs/xfs/xfs_bmap_btree.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000,2002-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002-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/
 */
 #ifndef __XFS_BMAP_BTREE_H__
 #define __XFS_BMAP_BTREE_H__
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 4d63f1c490fe..9de5a1f312c0 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_btree.h b/fs/xfs/xfs_btree.h
index 30ee83712c79..e6b2a09401c6 100644
--- a/fs/xfs/xfs_btree.h
+++ b/fs/xfs/xfs_btree.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_BTREE_H__
 #define __XFS_BTREE_H__
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index a37ffc38bb16..07e2324152b1 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index 01aed5f2d579..07c708c2b529 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_BUF_ITEM_H__
 #define __XFS_BUF_ITEM_H__
diff --git a/fs/xfs/xfs_cap.h b/fs/xfs/xfs_cap.h
index 2deac7303758..433ec537f9bd 100644
--- a/fs/xfs/xfs_cap.h
+++ b/fs/xfs/xfs_cap.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_CAP_H__
 #define __XFS_CAP_H__
diff --git a/fs/xfs/xfs_clnt.h b/fs/xfs/xfs_clnt.h
index 6483c73b11b4..1fbe2bf1f3ec 100644
--- a/fs/xfs/xfs_clnt.h
+++ b/fs/xfs/xfs_clnt.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_CLNT_H__
 #define __XFS_CLNT_H__
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index b4075ec75453..c352d0633c31 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_da_btree.h b/fs/xfs/xfs_da_btree.h
index 654956e9787c..41352113721a 100644
--- a/fs/xfs/xfs_da_btree.h
+++ b/fs/xfs/xfs_da_btree.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
 */
 #ifndef __XFS_DA_BTREE_H__
 #define __XFS_DA_BTREE_H__
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index 925b0a22c664..070259a4254c 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_dfrag.h b/fs/xfs/xfs_dfrag.h
index 904860594b8f..f678559abc45 100644
--- a/fs/xfs/xfs_dfrag.h
+++ b/fs/xfs/xfs_dfrag.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DFRAG_H__
 #define __XFS_DFRAG_H__
diff --git a/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h
index 9e1fd2323255..c5a0e537ff1a 100644
--- a/fs/xfs/xfs_dinode.h
+++ b/fs/xfs/xfs_dinode.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
 */
 #ifndef __XFS_DINODE_H__
 #define __XFS_DINODE_H__
diff --git a/fs/xfs/xfs_dir.c b/fs/xfs/xfs_dir.c
index d32824e8d86c..3dd30391f551 100644
--- a/fs/xfs/xfs_dir.c
+++ b/fs/xfs/xfs_dir.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2001,2005 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"
diff --git a/fs/xfs/xfs_dir.h b/fs/xfs/xfs_dir.h
index 4dbc9f54cca5..488defe86ba6 100644
--- a/fs/xfs/xfs_dir.h
+++ b/fs/xfs/xfs_dir.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DIR_H__
 #define __XFS_DIR_H__
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index 40a741c7e5c4..022c8398ab62 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -1,33 +1,19 @@
 /*
- * 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"
diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h
index 8f4fc7f23bcd..7e24ffeda9e1 100644
--- a/fs/xfs/xfs_dir2.h
+++ b/fs/xfs/xfs_dir2.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_DIR2_H__
 #define __XFS_DIR2_H__
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 47b5d2c4b933..31bc99faa704 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_dir2_block.h b/fs/xfs/xfs_dir2_block.h
index 70dcbe8976f7..a2e5cb98a838 100644
--- a/fs/xfs/xfs_dir2_block.h
+++ b/fs/xfs/xfs_dir2_block.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_DIR2_BLOCK_H__
 #define __XFS_DIR2_BLOCK_H__
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c
index 4b25f7e7c810..5b7c47e2f14a 100644
--- a/fs/xfs/xfs_dir2_data.c
+++ b/fs/xfs/xfs_dir2_data.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_dir2_data.h b/fs/xfs/xfs_dir2_data.h
index eeff85570723..5e3a7f9ec735 100644
--- a/fs/xfs/xfs_dir2_data.h
+++ b/fs/xfs/xfs_dir2_data.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DIR2_DATA_H__
 #define __XFS_DIR2_DATA_H__
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index 89e48877e0ea..d342b6b55239 100644
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_dir2_leaf.h b/fs/xfs/xfs_dir2_leaf.h
index 43f0ec2131a9..1393993d61e9 100644
--- a/fs/xfs/xfs_dir2_leaf.h
+++ b/fs/xfs/xfs_dir2_leaf.h
@@ -1,41 +1,23 @@
 /*
- * 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/
 */
 #ifndef __XFS_DIR2_LEAF_H__
 #define __XFS_DIR2_LEAF_H__
-/*
- * Directory version 2, leaf block structures.
- */
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 2517460430d3..641f8633d254 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_dir2_node.h b/fs/xfs/xfs_dir2_node.h
index 70fa0797c207..0ab8fbd59512 100644
--- a/fs/xfs/xfs_dir2_node.h
+++ b/fs/xfs/xfs_dir2_node.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DIR2_NODE_H__
 #define __XFS_DIR2_NODE_H__
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index 95e703d5bc05..6504afc54a55 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_dir2_sf.h b/fs/xfs/xfs_dir2_sf.h
index 133464935ef1..42f015b70018 100644
--- a/fs/xfs/xfs_dir2_sf.h
+++ b/fs/xfs/xfs_dir2_sf.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_DIR2_SF_H__
 #define __XFS_DIR2_SF_H__
diff --git a/fs/xfs/xfs_dir2_trace.c b/fs/xfs/xfs_dir2_trace.c
index 34e5138c670a..c626943b4112 100644
--- a/fs/xfs/xfs_dir2_trace.c
+++ b/fs/xfs/xfs_dir2_trace.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_dir2_trace.h b/fs/xfs/xfs_dir2_trace.h
index 0a178bffa806..ca3c754f4822 100644
--- a/fs/xfs/xfs_dir2_trace.h
+++ b/fs/xfs/xfs_dir2_trace.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DIR2_TRACE_H__
 #define __XFS_DIR2_TRACE_H__
diff --git a/fs/xfs/xfs_dir_leaf.c b/fs/xfs/xfs_dir_leaf.c
index 22997d314cf2..f0c603a78fc1 100644
--- a/fs/xfs/xfs_dir_leaf.c
+++ b/fs/xfs/xfs_dir_leaf.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_dir_leaf.h b/fs/xfs/xfs_dir_leaf.h
index 216d62693b72..ab6b09eef9ab 100644
--- a/fs/xfs/xfs_dir_leaf.h
+++ b/fs/xfs/xfs_dir_leaf.h
@@ -1,33 +1,19 @@
 /*
- * 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/
 */
 #ifndef __XFS_DIR_LEAF_H__
 #define __XFS_DIR_LEAF_H__
diff --git a/fs/xfs/xfs_dir_sf.h b/fs/xfs/xfs_dir_sf.h
index 2b75b767e152..fe44c6f4d560 100644
--- a/fs/xfs/xfs_dir_sf.h
+++ b/fs/xfs/xfs_dir_sf.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_DIR_SF_H__
 #define __XFS_DIR_SF_H__
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h
index 19e872856f6b..5a5c7a63e80b 100644
--- a/fs/xfs/xfs_dmapi.h
+++ b/fs/xfs/xfs_dmapi.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_DMAPI_H__
 #define __XFS_DMAPI_H__
diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 1b99c4dfbab3..629795b3b3d5 100644
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 5da2738b4538..d7b6b5d16704 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -1,33 +1,19 @@
 /*
- * 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"
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 66eef1beb0e5..06d8a8426c16 100644
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -1,39 +1,25 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_ERROR_H__
 #define __XFS_ERROR_H__
 #define prdev(fmt,targ,args...) \
-        printk("XFS: device %s- " fmt "\n", XFS_BUFTARG_NAME(targ), ## args)
+        printk("XFS: device %s - " fmt "\n", XFS_BUFTARG_NAME(targ), ## args)
 #define XFS_ERECOVER    1       /* Failure to recover log */
 #define XFS_ELOGSTAT    2       /* Failure to stat log in user space */
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index f48cc9a7cd5a..f19282ec8549 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -1,33 +1,19 @@
 /*
- * 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"
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index d433bac9f59d..5bf681708fec 100644
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/xfs_extfree_item.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_EXTFREE_ITEM_H__
 #define __XFS_EXTFREE_ITEM_H__
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
index 7bf2e92b8c0b..ba096f80f48d 100644
--- a/fs/xfs/xfs_fs.h
+++ b/fs/xfs/xfs_fs.h
@@ -1,34 +1,19 @@
 /*
- * Copyright (c) 1995-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 1995-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.1 of the GNU Lesser General Public License
+ * modify it under the terms of the GNU General Public License as
- * as published by the Free Software Foundation.
+ * 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 Lesser 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/
 */
 #ifndef __XFS_FS_H__
 #define __XFS_FS_H__
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 411081c0fd7c..239e701e9822 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_fsops.h b/fs/xfs/xfs_fsops.h
index b61486173a61..f32713f14f9a 100644
--- a/fs/xfs/xfs_fsops.h
+++ b/fs/xfs/xfs_fsops.h
@@ -1,67 +1,29 @@
 /*
- * 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/
 */
 #ifndef __XFS_FSOPS_H__
 #define __XFS_FSOPS_H__
-int
+extern int xfs_fs_geometry(xfs_mount_t *mp, xfs_fsop_geom_t *geo, int nversion);
-xfs_fs_geometry(
+extern int xfs_growfs_data(xfs_mount_t *mp, xfs_growfs_data_t *in);
-        xfs_mount_t             *mp,
+extern int xfs_growfs_log(xfs_mount_t *mp, xfs_growfs_log_t *in);
-        xfs_fsop_geom_t         *geo,
+extern int xfs_fs_counts(xfs_mount_t *mp, xfs_fsop_counts_t *cnt);
-        int                     new_version);
+extern int xfs_reserve_blocks(xfs_mount_t *mp, __uint64_t *inval,
+                                xfs_fsop_resblks_t *outval);
-int
+extern int xfs_fs_goingdown(xfs_mount_t *mp, __uint32_t inflags);
-xfs_growfs_data(
-        xfs_mount_t             *mp,
-        xfs_growfs_data_t       *in);
-int
-xfs_growfs_log(
-        xfs_mount_t             *mp,
-        xfs_growfs_log_t        *in);
-int
-xfs_fs_counts(
-        xfs_mount_t             *mp,
-        xfs_fsop_counts_t       *cnt);
-int
-xfs_reserve_blocks(
-        xfs_mount_t             *mp,
-        __uint64_t              *inval,
-        xfs_fsop_resblks_t      *outval);
-int
-xfs_fs_goingdown(
-        xfs_mount_t             *mp,
-        __uint32_t              inflags);
 #endif  /* __XFS_FSOPS_H__ */
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 4fc0e73fd18f..d8ceb3d1865f 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h
index fab660dd6d1b..7f5debe1acb6 100644
--- a/fs/xfs/xfs_ialloc.h
+++ b/fs/xfs/xfs_ialloc.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_IALLOC_H__
 #define __XFS_IALLOC_H__
diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/xfs_ialloc_btree.c
index a49958d21e87..e5c23445d38b 100644
--- a/fs/xfs/xfs_ialloc_btree.c
+++ b/fs/xfs/xfs_ialloc_btree.c
@@ -1,33 +1,19 @@
 /*
- * 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"
@@ -55,14 +41,6 @@
 #include "xfs_alloc.h"
 #include "xfs_error.h"
-/*
- * Inode allocation management for XFS.
- */
-/*
- * Prototypes for internal functions.
- */
 STATIC void xfs_inobt_log_block(xfs_trans_t *, xfs_buf_t *, int);
 STATIC void xfs_inobt_log_keys(xfs_btree_cur_t *, xfs_buf_t *, int, int);
 STATIC void xfs_inobt_log_ptrs(xfs_btree_cur_t *, xfs_buf_t *, int, int);
@@ -75,10 +53,6 @@ STATIC int xfs_inobt_split(xfs_btree_cur_t *, int, xfs_agblock_t *,
 STATIC int xfs_inobt_updkey(xfs_btree_cur_t *, xfs_inobt_key_t *, int);
 /*
- * Internal functions.
- */
-/*
 * Single level of the xfs_inobt_delete record deletion routine.
 * Delete record pointed to by cur/level.
 * Remove the record from its block then rebalance the tree.
diff --git a/fs/xfs/xfs_ialloc_btree.h b/fs/xfs/xfs_ialloc_btree.h
index b8c7e72ed837..86ed749d4cc1 100644
--- a/fs/xfs/xfs_ialloc_btree.h
+++ b/fs/xfs/xfs_ialloc_btree.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_IALLOC_BTREE_H__
 #define __XFS_IALLOC_BTREE_H__
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index f925335e4553..fc19eedbd11b 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_imap.h b/fs/xfs/xfs_imap.h
index e385064a066a..d36450003983 100644
--- a/fs/xfs/xfs_imap.h
+++ b/fs/xfs/xfs_imap.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_IMAP_H__
 #define __XFS_IMAP_H__
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index edf50b5409fc..281cbd45b3d3 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 11be922698af..d9e9cbaee28e 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_INODE_H__
 #define __XFS_INODE_H__
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index cebcc2781bbb..7f3363c621e1 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
index 61a806ba8fdd..c5dbf93b6661 100644
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_INODE_ITEM_H__
 #define __XFS_INODE_ITEM_H__
diff --git a/fs/xfs/xfs_inum.h b/fs/xfs/xfs_inum.h
index 8f70a12d56bc..7a28191cb0de 100644
--- a/fs/xfs/xfs_inum.h
+++ b/fs/xfs/xfs_inum.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_INUM_H__
 #define __XFS_INUM_H__
diff --git a/fs/xfs/xfs_iocore.c b/fs/xfs/xfs_iocore.c
index 6bdd0dcbe398..a07815661a8c 100644
--- a/fs/xfs/xfs_iocore.c
+++ b/fs/xfs/xfs_iocore.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 1ba0d71349c8..113c647a9f6f 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index 4daaa5212102..fcd6d63bb68b 100644
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2003-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/
 */
 #ifndef __XFS_IOMAP_H__
 #define __XFS_IOMAP_H__
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index abac0399ca4b..a4d186d2db47 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 2be9d1805ab2..047d834ed210 100644
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -1,33 +1,18 @@
 /*
 * Copyright (c) 2000-2001 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/
 */
 #ifndef __XFS_ITABLE_H__
 #define __XFS_ITABLE_H__
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 97e2a3b0ca1f..a9e0c38d18a4 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index dc920f83412d..158829ca56f6 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_LOG_H__
 #define __XFS_LOG_H__
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index bec421a735f3..758e4eb67c0c 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_LOG_PRIV_H__
 #define __XFS_LOG_PRIV_H__
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index f61dcd1b8e3b..b628c9eca420 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_log_recover.h b/fs/xfs/xfs_log_recover.h
index 42158b442b55..b22545555301 100644
--- a/fs/xfs/xfs_log_recover.h
+++ b/fs/xfs/xfs_log_recover.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_LOG_RECOVER_H__
 #define __XFS_LOG_RECOVER_H__
diff --git a/fs/xfs/xfs_mac.h b/fs/xfs/xfs_mac.h
index 8d59aaffeb8e..18e0e98e03d0 100644
--- a/fs/xfs/xfs_mac.h
+++ b/fs/xfs/xfs_mac.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2001-2002,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/
 */
 #ifndef __XFS_MAC_H__
 #define __XFS_MAC_H__
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 52542c5d7a32..9e861d0d3ee6 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 0567ee2164fa..04f8e37cb264 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -1,38 +1,23 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_MOUNT_H__
 #define __XFS_MOUNT_H__
 typedef struct xfs_trans_reservations {
        uint    tr_write;       /* extent alloc trans */
        uint    tr_itruncate;   /* truncate trans */
@@ -57,7 +42,6 @@ typedef struct xfs_trans_reservations {
        uint    tr_growrtfree;  /* grow realtime freeing */
 } xfs_trans_reservations_t;
 #ifndef __KERNEL__
 /*
 * Moved here from xfs_ag.h to avoid reordering header files
diff --git a/fs/xfs/xfs_qmops.c b/fs/xfs/xfs_qmops.c
index ac14d26fa9c4..1408a32eef88 100644
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index ed965883f702..fc763a8334ac 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_QUOTA_H__
 #define __XFS_QUOTA_H__
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c
index 135172414582..4d4e8f4e768e 100644
--- a/fs/xfs/xfs_rename.c
+++ b/fs/xfs/xfs_rename.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 145f916538a1..06fc061c50fc 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h
index e2710264c054..0e0b4d2ec202 100644
--- a/fs/xfs/xfs_rtalloc.h
+++ b/fs/xfs/xfs_rtalloc.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_RTALLOC_H__
 #define __XFS_RTALLOC_H__
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c
index 075850c999f4..c4b20872f07d 100644
--- a/fs/xfs/xfs_rw.c
+++ b/fs/xfs/xfs_rw.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_rw.h b/fs/xfs/xfs_rw.h
index 90233037fab1..de85eefb7966 100644
--- a/fs/xfs/xfs_rw.h
+++ b/fs/xfs/xfs_rw.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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/
 */
 #ifndef __XFS_RW_H__
 #define __XFS_RW_H__
diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h
index a7b2542fd7ba..4a17d335f897 100644
--- a/fs/xfs/xfs_sb.h
+++ b/fs/xfs/xfs_sb.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_SB_H__
 #define __XFS_SB_H__
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index d14adef65a26..de3abf868ee3 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003,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"
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 6381669a34ac..a889963fdd14 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_TRANS_H__
 #define __XFS_TRANS_H__
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index f248cb60ff7c..19ab24af1c1c 100644
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 24630da76a29..c74c31ebc81c 100644
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_trans_extfree.c b/fs/xfs/xfs_trans_extfree.c
index 1f6b17777f2d..7d7d627f25df 100644
--- a/fs/xfs/xfs_trans_extfree.c
+++ b/fs/xfs/xfs_trans_extfree.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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"
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c
index 060b1a72eef1..e341409172d2 100644
--- a/fs/xfs/xfs_trans_inode.c
+++ b/fs/xfs/xfs_trans_inode.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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"
diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c
index 8edfb151df10..486147ef0e3d 100644
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
index d4dae7d06afc..13edab8a9e94 100644
--- a/fs/xfs/xfs_trans_priv.h
+++ b/fs/xfs/xfs_trans_priv.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002,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/
 */
 #ifndef __XFS_TRANS_PRIV_H__
 #define __XFS_TRANS_PRIV_H__
diff --git a/fs/xfs/xfs_trans_space.h b/fs/xfs/xfs_trans_space.h
index e91d173f4ed3..7fe3792b18df 100644
--- a/fs/xfs/xfs_trans_space.h
+++ b/fs/xfs/xfs_trans_space.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,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/
 */
 #ifndef __XFS_TRANS_SPACE_H__
 #define __XFS_TRANS_SPACE_H__
diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 33a888e6b3f2..104f64a98790 100644
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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/
 */
 #ifndef __XFS_TYPES_H__
 #define __XFS_TYPES_H__
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c
index c6459514fadb..fefe1d60377f 100644
--- a/fs/xfs/xfs_utils.c
+++ b/fs/xfs/xfs_utils.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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"
diff --git a/fs/xfs/xfs_utils.h b/fs/xfs/xfs_utils.h
index 01d98b4b7af7..472661a3b6d8 100644
--- a/fs/xfs/xfs_utils.h
+++ b/fs/xfs/xfs_utils.h
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,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/
 */
 #ifndef __XFS_UTILS_H__
 #define __XFS_UTILS_H__
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 9ea201762a9c..4b8b54dfe876 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 443ec6a0b2b8..5bf9b2a0b57c 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-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"