TAKE - 2.4/2.5 sync

[Nathan Scott <nathans@snort.melbourne.sgi.com>]

Date:  Wed May 29 23:47:06 PDT 2002
Workarea:  snort.melbourne.sgi.com:/home/nathans/pagebuf

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs


Modid:  2.5.x-xfs:slinx:120431a
linux/fs/xfs/xfsidbg.c - 1.183
	- remove an unused field from the incore xfs dquot structure.

linux/fs/xfs/xfs_rw.c - 1.358
linux/fs/xfs/xfs_buf.h - 1.89
linux/fs/xfs/xfs_buf_item.c - 1.122
	- reconcile minor differences between the 2.4 and 2.5 XFS trees.

linux/fs/xfs/xfs_da_btree.c - 1.127
linux/fs/xfs/xfs_da_btree.h - 1.42
	- fix dev_t use if DA_DEBUG is defined (not usually).

linux/fs/xfs/xfs_vnodeops.c - 1.528
linux/fs/xfs/xfs_dmapi.c - 1.57
linux/fs/xfs/xfs_log_recover.c - 1.230
	- reconcile minor differences between the 2.4 and 2.5 XFS trees.

linux/fs/xfs/xfs_dquot.h - 1.20
	- remove an unused field from the incore xfs dquot structure.

linux/fs/xfs/xfs_dquot.c - 1.64
linux/fs/xfs/xfs_mount.c - 1.286
linux/fs/xfs/xfs_types.h - 1.55
linux/fs/xfs/xfs_trans_buf.c - 1.101
linux/fs/xfs/linux/xfs_lrw.c - 1.138
	- reconcile minor differences between the 2.4 and 2.5 XFS trees.

linux/fs/xfs/linux/xfs_super.c - 1.182
	- reconcile minor differences between the 2.4 and 2.5 XFS trees.
	  the ino64 mount option parsing code was missing on 2.5 only.

linux/fs/xfs/pagebuf/page_buf.h - 1.17
	- remove pagebuf_segment_apply and page_buf_apply_t, these no longer
	  exist due to the bio rework in pagebuf.

linux/fs/xfs/pagebuf/page_buf_internal.h - 1.7
	- reconcile minor differences between the 2.4 and 2.5 XFS trees.