This monster mod removes all SIM remnants from the kernel code, which
tidies up a whole bunch of stuff. Since I was going to be changing
almost every XFS kernel file in this, I took the opporunity to make
the XFS src use a common header file. This moves all the knowledge
of include order, magic #define settings, etc into a common place,
as well as moving (almost) all pseudo-inc #include's into one spot
(for easier removal later).
Alot more stuff came out than went in here & my little srcdiff script
also now reports no differences between kernel and libxfs code. The
last thing I did was remove #idents - these were causing problems
with the user/kernel header reconciliation.
Tested this using both debug & non-debug builds and did full qa runs
against both without issues. However, I've been manually merging all
changes into this tree for over a week now, so I guess its feasible
something has been missed/merged incorrectly - I don't think so tho.
cheers.
Modid: 2.4.x-xfs:slinx:74929a
Date: Sun Sep 24 22:42:07 PDT 2000
Workarea: snort:/build4/nathans/linux-xfs
Author: nathans
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
cmd/xfs/include/libxfs.h - 1.17
cmd/xfs/include/xfs_ag.h - 1.2
cmd/xfs/include/xfs_alloc.h - 1.3
cmd/xfs/include/xfs_arch.h - 1.3
cmd/xfs/include/xfs_attr_sf.h - 1.3
cmd/xfs/include/xfs_bmap.h - 1.4
cmd/xfs/include/xfs_bmap_btree.h - 1.2
cmd/xfs/include/xfs_buf_item.h - 1.3
cmd/xfs/include/xfs_cred.h - 1.2
cmd/xfs/include/xfs_da_btree.h - 1.2
cmd/xfs/include/xfs_dfrag.h - 1.5
cmd/xfs/include/xfs_dir.h - 1.2
cmd/xfs/include/xfs_dir2.h - 1.2
cmd/xfs/include/xfs_dir2_block.h - 1.2
cmd/xfs/include/xfs_dir2_leaf.h - 1.2
cmd/xfs/include/xfs_dir2_node.h - 1.2
cmd/xfs/include/xfs_dir2_sf.h - 1.2
cmd/xfs/include/xfs_dir_leaf.h - 1.2
cmd/xfs/include/xfs_dir_sf.h - 1.2
cmd/xfs/include/xfs_fs.h - 1.2
cmd/xfs/include/xfs_ialloc.h - 1.3
cmd/xfs/include/xfs_imap.h - 1.4
cmd/xfs/include/xfs_inode.h - 1.3
cmd/xfs/include/xfs_log.h - 1.2
cmd/xfs/include/xfs_log_priv.h - 1.3
cmd/xfs/include/xfs_mount.h - 1.3
cmd/xfs/include/xfs_quota.h - 1.3
cmd/xfs/include/xfs_rtalloc.h - 1.2
cmd/xfs/include/xfs_sb.h - 1.2
cmd/xfs/include/xfs_types.h - 1.3
- merge changes from current top of tree kernel sources.
cmd/xfs/libxfs/util.c - 1.4
- libxfs_da_read_bufr, libxfs_da_bhold, and libxfs_da_bjoin were
in the kernel and not needed/built as part of the kernel - move
to here since they're only needed in userland.
cmd/xfs/libxfs/xfs.h - 1.7
cmd/xfs/libxfs/xfs_alloc.c - 1.2
cmd/xfs/libxfs/xfs_bmap.c - 1.3
cmd/xfs/libxfs/xfs_btree.c - 1.2
cmd/xfs/libxfs/xfs_da_btree.c - 1.2
cmd/xfs/libxfs/xfs_dir2_node.c - 1.2
cmd/xfs/libxfs/xfs_inode.c - 1.4
- merge changes from current top of tree kernel sources.
cmd/xfs/logprint/log_print_all.c - 1.3
- xlog_recover_print_item and xlog_recover_print_trans were in the
kernel source but only needed by logprint - move to here since
they're only needed in userland.
cmd/xfs/logprint/xfs_log_recover.c - 1.2
- merge changes from current top of tree kernel sources.
linux/fs/xfs/Makefile - 1.108
- don't provide -Ipseudo-inc, rework grio/rt a bit, remove -D_KERNEL,
rework quota objects - in general, tidy up.
linux/fs/xfs/acl_xfs.c - 1.10
- use xfs.h, remove all traces of SIM, push extern declarations
into headers, dead code removal.
linux/fs/xfs/linux/Makefile - 1.24
- remove -Ipseudo-inc - only a few places still use these headers, and
they're all explicit now. remove -D_KERNEL.
linux/fs/xfs/linux/xfs_aclstubs.c - 1.7
linux/fs/xfs/linux/xfs_behavior.c - 1.12
linux/fs/xfs/linux/xfs_cred.c - 1.9
linux/fs/xfs/linux/xfs_cred.h - 1.7
linux/fs/xfs/linux/xfs_debug.c - 1.12
linux/fs/xfs/linux/xfs_dmistubs.c - 1.9
linux/fs/xfs/linux/xfs_file.c - 1.34
linux/fs/xfs/linux/xfs_fs_subr.c - 1.22
linux/fs/xfs/linux/xfs_globals.c - 1.17
linux/fs/xfs/linux/xfs_griostubs.c - 1.11
linux/fs/xfs/linux/xfs_ioctl.c - 1.21
linux/fs/xfs/linux/xfs_iops.c - 1.71
linux/fs/xfs/linux/xfs_linux.h - 1.28
linux/fs/xfs/linux/xfs_locks.c - 1.21
linux/fs/xfs/linux/xfs_lrw.c - 1.55
linux/fs/xfs/linux/xfs_lrw.h - 1.12
linux/fs/xfs/linux/xfs_mount_opt.c - 1.13
linux/fs/xfs/linux/xfs_move.c - 1.12
linux/fs/xfs/linux/xfs_random.c - 1.45
linux/fs/xfs/linux/xfs_sema.h - 1.27
linux/fs/xfs/linux/xfs_super.c - 1.90
linux/fs/xfs/linux/xfs_uaccess.c - 1.5
linux/fs/xfs/linux/xfs_uuid.c - 1.21
linux/fs/xfs/linux/xfs_vfs.c - 1.18
linux/fs/xfs/linux/xfs_vnode.c - 1.44
linux/fs/xfs/mac_xfs.c - 1.9
linux/fs/xfs/macstubs.c - 1.6
linux/fs/xfs/pseudo-inc/ksys/behavior.h - 1.9
linux/fs/xfs/pseudo-inc/ksys/cell_config.h - 1.4
linux/fs/xfs/pseudo-inc/ksys/fsc_notify.h - 1.5
linux/fs/xfs/pseudo-inc/ksys/vfile.h - 1.6
linux/fs/xfs/pseudo-inc/sys/cmn_err.h - 1.5
linux/fs/xfs/pseudo-inc/sys/dirent.h - 1.5
linux/fs/xfs/pseudo-inc/sys/fs_subr.h - 1.9
linux/fs/xfs/pseudo-inc/sys/kabi.h - 1.7
linux/fs/xfs/pseudo-inc/sys/ktrace.h - 1.5
linux/fs/xfs/pseudo-inc/sys/mode.h - 1.3
linux/fs/xfs/pseudo-inc/sys/pathname.h - 1.5
linux/fs/xfs/pseudo-inc/sys/pvfs.h - 1.6
linux/fs/xfs/pseudo-inc/sys/statvfs.h - 1.5
linux/fs/xfs/pseudo-inc/sys/systm.h - 1.9
linux/fs/xfs/pseudo-inc/sys/types.h - 1.20
linux/fs/xfs/pseudo-inc/sys/uio.h - 1.12
linux/fs/xfs/pseudo-inc/sys/uuid.h - 1.9
linux/fs/xfs/pseudo-inc/sys/vfs.h - 1.14
linux/fs/xfs/pseudo-inc/sys/vnode.h - 1.32
linux/fs/xfs/xfs_ag.h - 1.37
linux/fs/xfs/xfs_alloc.c - 1.135
linux/fs/xfs/xfs_alloc.h - 1.47
linux/fs/xfs/xfs_alloc_btree.c - 1.63
linux/fs/xfs/xfs_alloc_btree.h - 1.20
linux/fs/xfs/xfs_arch.h - 1.29
linux/fs/xfs/xfs_attr.c - 1.80
linux/fs/xfs/xfs_attr.h - 1.15
linux/fs/xfs/xfs_attr_fetch.c - 1.8
linux/fs/xfs/xfs_attr_leaf.c - 1.51
linux/fs/xfs/xfs_attr_leaf.h - 1.26
linux/fs/xfs/xfs_attr_sf.h - 1.13
linux/fs/xfs/xfs_bit.h - 1.7
linux/fs/xfs/xfs_bmap.c - 1.260
linux/fs/xfs/xfs_bmap.h - 1.74
linux/fs/xfs/xfs_bmap_btree.c - 1.116
linux/fs/xfs/xfs_bmap_btree.h - 1.50
linux/fs/xfs/xfs_btree.c - 1.87
linux/fs/xfs/xfs_btree.h - 1.50
linux/fs/xfs/xfs_buf.h - 1.62
linux/fs/xfs/xfs_buf_item.c - 1.110
linux/fs/xfs/xfs_buf_item.h - 1.32
linux/fs/xfs/xfs_clnt.h - 1.21
linux/fs/xfs/xfs_cxfs.h - 1.7
linux/fs/xfs/xfs_da_btree.c - 1.112
linux/fs/xfs/xfs_da_btree.h - 1.40
linux/fs/xfs/xfs_dfrag.c - 1.23
linux/fs/xfs/xfs_dfrag.h - 1.5
linux/fs/xfs/xfs_dinode.h - 1.56
linux/fs/xfs/xfs_dir.c - 1.129
linux/fs/xfs/xfs_dir.h - 1.37
linux/fs/xfs/xfs_dir2.c - 1.23
linux/fs/xfs/xfs_dir2.h - 1.6
linux/fs/xfs/xfs_dir2_block.c - 1.16
linux/fs/xfs/xfs_dir2_block.h - 1.6
linux/fs/xfs/xfs_dir2_data.c - 1.12
linux/fs/xfs/xfs_dir2_data.h - 1.6
linux/fs/xfs/xfs_dir2_leaf.c - 1.16
linux/fs/xfs/xfs_dir2_leaf.h - 1.6
linux/fs/xfs/xfs_dir2_node.c - 1.16
linux/fs/xfs/xfs_dir2_node.h - 1.5
linux/fs/xfs/xfs_dir2_sf.c - 1.19
linux/fs/xfs/xfs_dir2_sf.h - 1.10
linux/fs/xfs/xfs_dir2_trace.c - 1.8
linux/fs/xfs/xfs_dir2_trace.h - 1.5
linux/fs/xfs/xfs_dir_leaf.c - 1.89
linux/fs/xfs/xfs_dir_leaf.h - 1.29
linux/fs/xfs/xfs_dir_sf.h - 1.19
linux/fs/xfs/xfs_dmapi.c - 1.25
linux/fs/xfs/xfs_dmapi.h - 1.11
linux/fs/xfs/xfs_dqblk.h - 1.5
linux/fs/xfs/xfs_dquot.c - 1.51
linux/fs/xfs/xfs_dquot.h - 1.16
linux/fs/xfs/xfs_dquot_item.c - 1.20
linux/fs/xfs/xfs_dquot_item.h - 1.5
linux/fs/xfs/xfs_error.c - 1.28
linux/fs/xfs/xfs_error.h - 1.16
linux/fs/xfs/xfs_extfree_item.c - 1.44
linux/fs/xfs/xfs_extfree_item.h - 1.13
linux/fs/xfs/xfs_fsops.c - 1.58
linux/fs/xfs/xfs_fsops.h - 1.18
linux/fs/xfs/xfs_grio.c - 1.85
linux/fs/xfs/xfs_grio.h - 1.2
linux/fs/xfs/xfs_ialloc.c - 1.140
linux/fs/xfs/xfs_ialloc.h - 1.39
linux/fs/xfs/xfs_ialloc_btree.c - 1.61
linux/fs/xfs/xfs_ialloc_btree.h - 1.19
linux/fs/xfs/xfs_iget.c - 1.129
linux/fs/xfs/xfs_imap.h - 1.7
linux/fs/xfs/xfs_inode.c - 1.303
linux/fs/xfs/xfs_inode.h - 1.142
linux/fs/xfs/xfs_inode_item.c - 1.94
linux/fs/xfs/xfs_inode_item.h - 1.38
linux/fs/xfs/xfs_inum.h - 1.18
linux/fs/xfs/xfs_iocore.c - 1.20
linux/fs/xfs/xfs_itable.c - 1.93
linux/fs/xfs/xfs_itable.h - 1.32
linux/fs/xfs/xfs_log.c - 1.223
linux/fs/xfs/xfs_log.h - 1.53
linux/fs/xfs/xfs_log_priv.h - 1.75
linux/fs/xfs/xfs_log_recover.c - 1.190
linux/fs/xfs/xfs_log_recover.h - 1.15
linux/fs/xfs/xfs_macros.c - 1.37
linux/fs/xfs/xfs_macros.h - 1.17
- use xfs.h, remove all traces of SIM, push extern declarations
into headers, dead code removal.
linux/fs/xfs/xfs_mount.c - 1.239
- use xfs.h, remove all traces of SIM, push extern declarations
into headers, dead code removal. also rework mount path so
that XFS_MFSI_RRINODES is no longer there - this was only there
for repair & we do this differently now (slightly).
xfs_mountfs_int has been renamed to xfs_mountfs, and the wrapper
routine for the kernel has been removed (as, of course, have the
wrapper routines for libsim).
linux/fs/xfs/xfs_mount.h - 1.117
linux/fs/xfs/xfs_os_defs.h - 1.13
linux/fs/xfs/xfs_qm.c - 1.54
linux/fs/xfs/xfs_qm.h - 1.16
linux/fs/xfs/xfs_qm_syscalls.c - 1.41
linux/fs/xfs/xfs_quota.h - 1.21
linux/fs/xfs/xfs_quota_priv.h - 1.13
linux/fs/xfs/xfs_rename.c - 1.28
linux/fs/xfs/xfs_rpc_item.c - 1.8
linux/fs/xfs/xfs_rpc_item.h - 1.4
linux/fs/xfs/xfs_rtalloc.c - 1.62
linux/fs/xfs/xfs_rtalloc.h - 1.20
linux/fs/xfs/xfs_rtbit.c - 1.7
linux/fs/xfs/xfs_rw.c - 1.327
linux/fs/xfs/xfs_rw.h - 1.56
linux/fs/xfs/xfs_sb.h - 1.48
linux/fs/xfs/xfs_trans.c - 1.117
linux/fs/xfs/xfs_trans.h - 1.107
linux/fs/xfs/xfs_trans_ail.c - 1.56
linux/fs/xfs/xfs_trans_buf.c - 1.91
linux/fs/xfs/xfs_trans_dquot.c - 1.27
linux/fs/xfs/xfs_trans_extfree.c - 1.19
linux/fs/xfs/xfs_trans_inode.c - 1.37
linux/fs/xfs/xfs_trans_item.c - 1.27
linux/fs/xfs/xfs_trans_priv.h - 1.17
linux/fs/xfs/xfs_trans_space.h - 1.9
linux/fs/xfs/xfs_types.h - 1.48
linux/fs/xfs/xfs_utils.c - 1.33
linux/fs/xfs/xfs_vfsops.c - 1.292
linux/fs/xfs/xfs_vnodeops.c - 1.474
linux/fs/xfs/xfsdmapistubs.c - 1.6
linux/fs/xfs/xfsidbg.c - 1.152
linux/fs/xfs/xfsquotasstubs.c - 1.11
linux/fs/xfs/xfsrtstubs.c - 1.10
linux/include/linux/dmapi.h - 1.2
- use xfs.h, remove all traces of SIM, push extern declarations
into headers, dead code removal.
linux/include/linux/dmapi_kern.h - 1.3
linux/include/linux/grio.h - 1.2
linux/include/linux/xfs_fs.h - 1.13
- _KERNEL -> __KERNEL__
|