[XFS] Trivial and whitespace changes to sync trees. Remove no-longer-used headers.

fs/xfs/Makefile

@@ -54,6 +54,9 @@ endif
 
 obj-$(CONFIG_XFS_FS)		+= xfs.o
 
+ifneq ($(CONFIG_XFS_DMAPI),y)
+xfs-y				+= xfs_dmops.o
+endif
 
 xfs-$(CONFIG_XFS_QUOTA)		+= $(addprefix quota/, \
 				   xfs_dquot.o \
@@ -68,10 +71,6 @@ else
 xfs-y				+= xfs_qmops.o
 endif
 
-ifneq ($(CONFIG_XFS_DMAPI),y)
-xfs-y				+= xfs_dmops.o
-endif
-
 xfs-$(CONFIG_XFS_RT)		+= xfs_rtalloc.o
 xfs-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o
 xfs-$(CONFIG_XFS_POSIX_CAP)	+= xfs_cap.o

fs/xfs/linux/xfs_super.c

@@ -877,9 +877,8 @@ init_xfs_fs( void )
 {
 	int			error;
 	struct sysinfo		si;
-	static char		message[] __initdata =
-		KERN_INFO "SGI XFS " XFS_VERSION_STRING " with "
-		XFS_BUILD_OPTIONS " enabled\n";
+	static char		message[] __initdata = KERN_INFO \
+		XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
 
 	printk(message);
 
@@ -933,6 +932,5 @@ module_init(init_xfs_fs);
 module_exit(exit_xfs_fs);
 
 MODULE_AUTHOR("Silicon Graphics, Inc.");
-MODULE_DESCRIPTION(
-	"SGI XFS " XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled");
+MODULE_DESCRIPTION(XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled");
 MODULE_LICENSE("GPL");

fs/xfs/linux/xfs_version.h

@@ -39,6 +39,6 @@
 #ifndef __XFS_VERSION_H__
 #define __XFS_VERSION_H__
 
-#define XFS_VERSION_STRING "for Linux"
+#define XFS_VERSION_STRING "SGI XFS"
 
 #endif /* __XFS_VERSION_H__ */

fs/xfs/pagebuf/page_buf.c

@@ -2102,3 +2102,6 @@ pagebuf_terminate(void)
  *	Module management (for kernel debugger module)
  */
 EXPORT_SYMBOL(pagebuf_offset);
+#ifdef DEBUG
+EXPORT_SYMBOL(pbd_delwrite_queue);
+#endif

fs/xfs/pagebuf/page_buf.h

 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as

fs/xfs/pagebuf/page_buf_internal.h

-/*
- * Copyright (c) 2002 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * 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/
- */
-
-/*
- * Written by Steve Lord at SGI
- */
-
-#ifndef __PAGE_BUF_PRIVATE_H__
-#define __PAGE_BUF_PRIVATE_H__
-
-#include <linux/percpu.h>
-#include "page_buf.h"
-
-#define _PAGE_BUF_INTERNAL_
-#define PB_DEFINE_TRACES
-#include "page_buf_trace.h"
-
-#ifdef PAGEBUF_LOCK_TRACKING
-#define PB_SET_OWNER(pb)	(pb->pb_last_holder = current->pid)
-#define PB_CLEAR_OWNER(pb)	(pb->pb_last_holder = -1)
-#define PB_GET_OWNER(pb)	(pb->pb_last_holder)
-#else
-#define PB_SET_OWNER(pb)
-#define PB_CLEAR_OWNER(pb)
-#define PB_GET_OWNER(pb)
-#endif /* PAGEBUF_LOCK_TRACKING */
-
-/* Tracing utilities for pagebuf */
-typedef struct {
-	int			event;
-	unsigned long		pb;
-	page_buf_flags_t	flags;
-	unsigned short		hold;
-	unsigned short		lock_value;
-	void			*task;
-	void			*misc;
-	void			*ra;
-	loff_t			offset;
-	size_t			size;
-} pagebuf_trace_t;
-
-struct pagebuf_trace_buf {
-	pagebuf_trace_t		*buf;
-	volatile int		start;
-	volatile int		end;
-};
-
-#define PB_TRACE_BUFSIZE	1024
-#define CIRC_INC(i)     (((i) + 1) & (PB_TRACE_BUFSIZE - 1))
-
-/*
- * Tunable pagebuf parameters
- */
-
-typedef struct pb_sysctl_val {
-	int min;
-	int val;
-	int max;
-} pb_sysctl_val_t;
-
-typedef struct pagebuf_param {
-	pb_sysctl_val_t	flush_interval;	/* interval between runs of the
-					 * delwri flush daemon.  */
-	pb_sysctl_val_t	age_buffer;	/* time for buffer to age before
-					 * we flush it.  */
-	pb_sysctl_val_t	stats_clear;	/* clear the pagebuf stats */
-	pb_sysctl_val_t	debug;		/* debug tracing on or off */
-} pagebuf_param_t;
-
-enum {
-	PB_FLUSH_INT = 1,
-	PB_FLUSH_AGE = 2,
-	PB_STATS_CLEAR = 3,
-	PB_DEBUG = 4
-};
-
-extern pagebuf_param_t	pb_params;
-
-/*
- * Pagebuf statistics
- */
-
-struct pbstats {
-	u_int32_t	pb_get;
-	u_int32_t	pb_create;
-	u_int32_t	pb_get_locked;
-	u_int32_t	pb_get_locked_waited;
-	u_int32_t	pb_busy_locked;
-	u_int32_t	pb_miss_locked;
-	u_int32_t	pb_page_retries;
-	u_int32_t	pb_page_found;
-	u_int32_t	pb_get_read;
-};
-
-DECLARE_PER_CPU(struct pbstats, pbstats);
-
-/* We don't disable preempt, not too worried about poking the
- * wrong cpu's stat for now */
-#define PB_STATS_INC(count)	(__get_cpu_var(pbstats).count++)
-
-#ifndef STATIC
-# define STATIC	static
-#endif
-
-#endif /* __PAGE_BUF_PRIVATE_H__ */

fs/xfs/pagebuf/page_buf_trace.h

-/*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * 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/
- */
-
-#ifndef __PAGEBUF_TRACE__
-#define __PAGEBUF_TRACE__
-
-#ifdef PB_DEFINE_TRACES
-#define PB_TRACE_START	typedef enum {
-#define PB_TRACE_REC(x)	pb_trace_point_##x
-#define PB_TRACE_END	} pb_trace_var_t;
-#else
-#define PB_TRACE_START	static char	*event_names[] = {
-#define PB_TRACE_REC(x)	#x
-#define PB_TRACE_END	};
-#endif
-
-PB_TRACE_START
-PB_TRACE_REC(get),
-PB_TRACE_REC(get_obj),
-PB_TRACE_REC(free_obj),
-PB_TRACE_REC(look_pg),
-PB_TRACE_REC(get_read),
-PB_TRACE_REC(no_daddr),
-PB_TRACE_REC(hold),
-PB_TRACE_REC(rele),
-PB_TRACE_REC(done),
-PB_TRACE_REC(ioerror),
-PB_TRACE_REC(iostart),
-PB_TRACE_REC(end_io),
-PB_TRACE_REC(do_io),
-PB_TRACE_REC(ioreq),
-PB_TRACE_REC(iowait),
-PB_TRACE_REC(iowaited),
-PB_TRACE_REC(free_lk),
-PB_TRACE_REC(freed_l),
-PB_TRACE_REC(cmp),
-PB_TRACE_REC(get_lk),
-PB_TRACE_REC(got_lk),
-PB_TRACE_REC(skip),
-PB_TRACE_REC(lock),
-PB_TRACE_REC(locked),
-PB_TRACE_REC(unlock),
-PB_TRACE_REC(avl_ret),
-PB_TRACE_REC(condlck),
-PB_TRACE_REC(avl_ins),
-PB_TRACE_REC(walkq1),
-PB_TRACE_REC(walkq2),
-PB_TRACE_REC(walkq3),
-PB_TRACE_REC(delwri_q),
-PB_TRACE_REC(delwri_uq),
-PB_TRACE_REC(pin),
-PB_TRACE_REC(unpin),
-PB_TRACE_REC(file_write),
-PB_TRACE_REC(external),
-PB_TRACE_END
-
-extern void pb_trace_func(page_buf_t *, int, void *, void *);
-#ifdef PAGEBUF_TRACE
-# define PB_TRACE(pb, event, misc)		\
-	pb_trace_func(pb, event, (void *) misc,	\
-			(void *)__builtin_return_address(0))
-#else
-# define PB_TRACE(pb, event, misc)	do { } while (0)
-#endif
-
-#endif	/* __PAGEBUF_TRACE__ */

fs/xfs/xfs_iget.c

@@ -450,13 +450,12 @@ xfs_iget(
 		xfs_inode_t	*ip;
 		int		newnode;
 
-
 		vp = LINVFS_GET_VP(inode);
 		if (inode->i_state & I_NEW) {
 inode_allocate:
 			vn_initialize(inode);
 			error = xfs_iget_core(vp, mp, tp, ino,
-							lock_flags, ipp, bno);
+						lock_flags, ipp, bno);
 			if (error) {
 				make_bad_inode(inode);
 				if (inode->i_state & I_NEW)