xfs: move most of xfs_sb.h to xfs_format.h

More on-disk format consolidation.

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 f782d36..0a472fb 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -22,7 +22,6 @@
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_bit.h"
-#include "xfs_sb.h"
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
 #include "xfs_da_btree.h"

diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index 4edd4a8..20de88d 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -23,7 +23,6 @@
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_bit.h"
-#include "xfs_sb.h"
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
 #include "xfs_da_btree.h"

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

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

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

diff --cc fs/xfs/libxfs/xfs_da_format.c
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_data.c
Simple merge

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

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

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

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

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

diff --cc fs/xfs/libxfs/xfs_ialloc_btree.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_rlimit.c
Simple merge

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

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

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

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

diff --cc fs/xfs/xfs_acl.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_dquot.c
Simple merge

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

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

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

diff --cc fs/xfs/xfs_extfree_item.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_inode_item.c
Simple merge

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

diff --cc fs/xfs/xfs_ioctl32.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_log.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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