Merge branch 'xfs-consolidate-format-defs' into for-next

2014-11-28 14:52:16 +11:00
parent 4bd47c1bf4 508b6b3b73
commit 216875a594
86 changed files with 1138 additions and 1380 deletions
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -23,9 +23,7 @@
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
-#include "xfs_inum.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
 #include "xfs_mount.h"
 #include "xfs_inode.h"
 #include "xfs_da_format.h"