diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-11-27 22:52:16 -0500 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-11-27 22:52:16 -0500 |
| commit | 216875a594e0b4fc72830e3690b8fbe7430738e2 (patch) | |
| tree | 4658b9b572333cd8a730a1104ad452764f0e69fe /fs/xfs/xfs_mount.c | |
| parent | 4bd47c1bf4a64225a855ed77e259eeb37944ba33 (diff) | |
| parent | 508b6b3b73888e3296ff638b32f15327e63b7b42 (diff) | |
Merge branch 'xfs-consolidate-format-defs' into for-next
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 13d117089101..f51e4629006f 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
| @@ -22,9 +22,7 @@ | |||
| 22 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
| 23 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
| 24 | #include "xfs_bit.h" | 24 | #include "xfs_bit.h" |
| 25 | #include "xfs_inum.h" | ||
| 26 | #include "xfs_sb.h" | 25 | #include "xfs_sb.h" |
| 27 | #include "xfs_ag.h" | ||
| 28 | #include "xfs_mount.h" | 26 | #include "xfs_mount.h" |
| 29 | #include "xfs_da_format.h" | 27 | #include "xfs_da_format.h" |
| 30 | #include "xfs_inode.h" | 28 | #include "xfs_inode.h" |
| @@ -41,7 +39,6 @@ | |||
| 41 | #include "xfs_fsops.h" | 39 | #include "xfs_fsops.h" |
| 42 | #include "xfs_trace.h" | 40 | #include "xfs_trace.h" |
| 43 | #include "xfs_icache.h" | 41 | #include "xfs_icache.h" |
| 44 | #include "xfs_dinode.h" | ||
| 45 | #include "xfs_sysfs.h" | 42 | #include "xfs_sysfs.h" |
| 46 | 43 | ||
| 47 | 44 | ||