xfs: merge xfs_dinode.h into xfs_format.h

More consolidatation for the on-disk format defintions.  Note that the
XFS_IS_REALTIME_INODE moves to xfs_linux.h instead as it is not related
to the on disk format, but depends on a CONFIG_ option.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 353fb42..4c0e33b 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -42,7 +42,6 @@
 #include "xfs_quota.h"
 #include "xfs_trans_space.h"
 #include "xfs_trace.h"
-#include "xfs_dinode.h"
 
 /*
  * xfs_attr.c

diff --cc fs/xfs/libxfs/xfs_attr_leaf.c
Simple merge

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

diff --cc fs/xfs/libxfs/xfs_bmap_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dinode.h
Simple merge

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

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

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

diff --cc fs/xfs/libxfs/xfs_format.h
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_inode_buf.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_inode_fork.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_log_format.h
Simple merge

diff --cc fs/xfs/libxfs/xfs_rtbitmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc fs/xfs/xfs_linux.h
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_qm.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