diff options
author | Dave Chinner <david@fromorbit.com> | 2014-12-03 23:46:17 +0100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-12-03 23:46:17 +0100 |
commit | 6044e4386cd51dece882ea42352cdaaab0f24cad (patch) | |
tree | cde51132ea9d6afefdf05ad621fc22bbb796d5f4 /fs/xfs/xfs_export.c | |
parent | Merge branch 'xfs-coccinelle-cleanups' into for-next (diff) | |
parent | xfs: split metadata and log buffer completion to separate workqueues (diff) | |
download | linux-6044e4386cd51dece882ea42352cdaaab0f24cad.tar.xz linux-6044e4386cd51dece882ea42352cdaaab0f24cad.zip |
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_export.c')
-rw-r--r-- | fs/xfs/xfs_export.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c index 0a0a6fa11ce1..5eb4a14e0a0f 100644 --- 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" |