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_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -34,10 +34,10 @@
 #include <linux/backing-dev.h>
 #include <linux/freezer.h>

+#include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
 #include "xfs_mount.h"
 #include "xfs_trace.h"
 #include "xfs_log.h"