xfs: reshuffle dir2 definitions around for userspace

Many of the definitions within xfs_dir2_priv.h are needed in
userspace outside libxfs. Definitions within xfs_dir2_priv.h are
wholly contained within libxfs, so we need to shuffle some of the
definitions around to keep consistency across files shared between
user and kernel space.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

diff --cc fs/xfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/xfs_dir2.h
Simple merge

diff --cc fs/xfs/xfs_dir2_block.c
Simple merge

diff --cc fs/xfs/xfs_dir2_data.c
Simple merge

diff --cc fs/xfs/xfs_dir2_leaf.c
Simple merge

diff --cc fs/xfs/xfs_dir2_node.c
Simple merge

diff --cc fs/xfs/xfs_dir2_priv.h
Simple merge

diff --cc fs/xfs/xfs_dir2_readdir.c
Simple merge

diff --cc fs/xfs/xfs_dir2_sf.c
Simple merge

diff --cc fs/xfs/xfs_export.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_icreate_item.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge

diff --cc fs/xfs/xfs_rename.c
Simple merge

diff --cc fs/xfs/xfs_rtalloc.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc fs/xfs/xfs_symlink.c
Simple merge

diff --cc fs/xfs/xfs_utils.c
Simple merge

diff --cc fs/xfs/xfs_vnodeops.c
Simple merge