diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-12-03 17:46:17 -0500 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-12-03 17:46:17 -0500 |
| commit | 6044e4386cd51dece882ea42352cdaaab0f24cad (patch) | |
| tree | cde51132ea9d6afefdf05ad621fc22bbb796d5f4 /fs/xfs/xfs_log_recover.c | |
| parent | c14fc01340dd0afe58d8671acc3ea5e907e707ae (diff) | |
| parent | b29c70f59870dad0945b0e0b3fe3758ad528e268 (diff) | |
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 75705dd047b5..a5a945fc3bdc 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include "xfs_sb.h" | 25 | #include "xfs_sb.h" |
| 26 | #include "xfs_mount.h" | 26 | #include "xfs_mount.h" |
| 27 | #include "xfs_da_format.h" | 27 | #include "xfs_da_format.h" |
| 28 | #include "xfs_da_btree.h" | ||
| 28 | #include "xfs_inode.h" | 29 | #include "xfs_inode.h" |
| 29 | #include "xfs_trans.h" | 30 | #include "xfs_trans.h" |
| 30 | #include "xfs_log.h" | 31 | #include "xfs_log.h" |