Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

Conflicts: fs/xfs/xfs_iops.c
2014-12-04 09:46:17 +11:00
parent c14fc01340 b29c70f598
commit 6044e4386c
24 changed files with 270 additions and 385 deletions
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -21,6 +21,7 @@
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
+#include "xfs_da_btree.h"
 #include "xfs_dir2.h"
 #include "xfs_export.h"
 #include "xfs_inode.h"