[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

TAKE - sync 2.4/2.5 (final)



Should be the last of the sync-ups.

Date:  Thu May 30 20:57:01 PDT 2002
Workarea:  snort.melbourne.sgi.com:/home/nathans/2.4.x-xfs

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


Modid:  2.4.x-xfs:slinx:120539a
linux/fs/xfs/linux/xfs_linux.h - 1.67
linux/fs/xfs/pagebuf/page_buf_locking.c - 1.15
linux/fs/xfs/pagebuf/page_buf.c - 1.30
linux/fs/xfs/pagebuf/page_buf_internal.h - 1.8
	- minor change to keep files the same/similar between 2.4 and 2.5.

linux/fs/xfs/linux/xfs_vnode.c - 1.79
linux/fs/xfs/linux/xfs_super.c - 1.173
linux/fs/xfs/linux/xfs_iops.c - 1.145
linux/include/linux/xfs_fs_i.h - 1.7
linux/fs/xfs/linux/xfs_ioctl.c - 1.61
linux/fs/xfs/xfsidbg.c - 1.182
linux/fs/xfs/xfs_iget.c - 1.158
linux/fs/xfs_dmapi/xfsjunk.c - 1.5
linux/fs/xfs/linux/xfs_xattr.c - 1.10
	- Use a LINVFS_GET_VPTR macro (in 2.5 is the same as LINVFS_GET_VP,
	  in 2.4 its the same as LINVFS_GET_VN_ADDRESS) to allow us to keep a
	  bunch of code the same between the two trees.

linux/include/linux/vnode.h - 1.5
	- remove some unnecessary/bogus struct forward declarations.

linux/fs/xfs/pagebuf/page_buf.h - 1.17
	- structures moved recently, move their associated comments with them.