diff options
author | Dave Chinner <david@fromorbit.com> | 2014-11-28 06:52:16 +0300 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-11-28 06:52:16 +0300 |
commit | 216875a594e0b4fc72830e3690b8fbe7430738e2 (patch) | |
tree | 4658b9b572333cd8a730a1104ad452764f0e69fe /fs/xfs/xfs_qm.c | |
parent | 4bd47c1bf4a64225a855ed77e259eeb37944ba33 (diff) | |
parent | 508b6b3b73888e3296ff638b32f15327e63b7b42 (diff) | |
download | linux-216875a594e0b4fc72830e3690b8fbe7430738e2.tar.xz |
Merge branch 'xfs-consolidate-format-defs' into for-next
Diffstat (limited to 'fs/xfs/xfs_qm.c')
-rw-r--r-- | fs/xfs/xfs_qm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index d68f23021af3..26d4a8d89dfa 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -23,7 +23,6 @@ #include "xfs_trans_resv.h" #include "xfs_bit.h" #include "xfs_sb.h" -#include "xfs_ag.h" #include "xfs_mount.h" #include "xfs_inode.h" #include "xfs_ialloc.h" @@ -38,7 +37,6 @@ #include "xfs_trace.h" #include "xfs_icache.h" #include "xfs_cksum.h" -#include "xfs_dinode.h" /* * The global quota manager. There is only one of these for the entire |