From: Dave Chinner Date: Thu, 2 Jul 2015 04:36:56 +0000 (+1000) Subject: progs: clean up all remaining xfs*h includes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d5d40bc990e72081d8bf666ba28f4580b7e49f;p=thirdparty%2Fxfsprogs-dev.git progs: clean up all remaining xfs*h includes Convert all the various ways of including xfs*.h to one standard way across all libraries and utilities: #include "xfs/xfs*.h" This means we are consistently including the local include/xfs/xfs*h header file in parts of the build. The exception to this is the libxfs/ directory, which does not use the "xfs/" prefix in files shared with the kernel to maintain as much similarity to the kernel code as possible. However, libxfs/ is the source that include/xfs points back to, so the local include rule ensures this works just fine. Signed-off-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 89fba5584..efc17a819 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -17,11 +17,11 @@ */ #include "xfs/libxfs.h" -#include -#include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/xfs_types.h" +#include "xfs/jdm.h" +#include "xfs/xfs_bmap_btree.h" +#include "xfs/xfs_attr_sf.h" #include #include diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index 3ff3b5dbf..821a87ddd 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/path.h" static void usage(void) diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h index 2140acd4e..d39285925 100644 --- a/include/gnukfreebsd.h +++ b/include/gnukfreebsd.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include "xfs/swab.h" #define constpp char * const * diff --git a/include/input.h b/include/input.h index 61b40c846..ae273addc 100644 --- a/include/input.h +++ b/include/input.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include "xfs/project.h" #include extern char **breakline(char *input, int *count); diff --git a/include/libxfs.h b/include/libxfs.h index 6a59cc024..1fd8bda27 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -19,27 +19,27 @@ #ifndef __LIBXFS_H__ #define __LIBXFS_H__ -#include -#include +#include "xfs/libxfs_api_defs.h" +#include "xfs/platform_defs.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "xfs/list.h" +#include "xfs/hlist.h" +#include "xfs/cache.h" +#include "xfs/bitops.h" +#include "xfs/kmem.h" +#include "xfs/radix-tree.h" +#include "xfs/swab.h" +#include "xfs/atomic.h" -#include -#include -#include +#include "xfs/xfs_types.h" +#include "xfs/xfs_fs.h" +#include "xfs/xfs_arch.h" -#include -#include -#include -#include -#include +#include "xfs/xfs_shared.h" +#include "xfs/xfs_format.h" +#include "xfs/xfs_log_format.h" +#include "xfs/xfs_quota_defs.h" +#include "xfs/xfs_trans_resv.h" /* CRC stuff, buffer API dependent on it */ @@ -49,33 +49,33 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len); #define crc32(c,p,l) crc32_le((c),(unsigned char const *)(p),(l)) #define crc32c(c,p,l) crc32c_le((c),(unsigned char const *)(p),(l)) -#include +#include "xfs/xfs_cksum.h" /* * This mirrors the kernel include for xfs_buf.h - it's implicitly included in * every files via a similar include in the kernel xfs_linux.h. */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xfs/libxfs_io.h" + +#include "xfs/xfs_bit.h" +#include "xfs/xfs_sb.h" +#include "xfs/xfs_mount.h" +#include "xfs/xfs_da_format.h" +#include "xfs/xfs_da_btree.h" +#include "xfs/xfs_dir2.h" +#include "xfs/xfs_bmap_btree.h" +#include "xfs/xfs_alloc_btree.h" +#include "xfs/xfs_ialloc_btree.h" +#include "xfs/xfs_attr_sf.h" +#include "xfs/xfs_inode_fork.h" +#include "xfs/xfs_inode_buf.h" +#include "xfs/xfs_inode.h" +#include "xfs/xfs_alloc.h" +#include "xfs/xfs_btree.h" +#include "xfs/xfs_btree_trace.h" +#include "xfs/xfs_bmap.h" +#include "xfs/xfs_trace.h" +#include "xfs/xfs_trans.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -174,11 +174,11 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC }; extern int libxfs_nproc(void); extern unsigned long libxfs_physmem(void); /* in kilobytes */ -#include +#include "xfs/xfs_ialloc.h" -#include -#include -#include +#include "xfs/xfs_attr_leaf.h" +#include "xfs/xfs_attr_remote.h" +#include "xfs/xfs_trans_space.h" #define XFS_INOBT_IS_FREE_DISK(rp,i) \ ((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0) diff --git a/include/libxlog.h b/include/libxlog.h index c6640a86a..e2ab5add4 100644 --- a/include/libxlog.h +++ b/include/libxlog.h @@ -44,7 +44,7 @@ struct xlog { int l_sectBBsize; /* size of log sector in 512 byte chunks */ }; -#include +#include "xfs/xfs_log_recover.h" /* * macros mapping kernel code to user code diff --git a/include/path.h b/include/path.h index 757ba49e1..c8746cb98 100644 --- a/include/path.h +++ b/include/path.h @@ -18,7 +18,7 @@ #ifndef __PATH_H__ #define __PATH_H__ -#include +#include "xfs/xfs.h" /* * XFS Filesystem Paths diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index ac260bcdd..05a726ac0 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -69,15 +69,15 @@ typedef __u64 __bitwise __be64; typedef struct filldir filldir_t; #if defined(__linux__) -#include +#include "xfs/linux.h" #elif defined(__FreeBSD__) -#include +#include "xfs/freebsd.h" #elif defined(__FreeBSD_kernel__) -#include +#include "xfs/gnukfreebsd.h" #elif defined(__APPLE__) -#include +#include "xfs/darwin.h" #elif defined(__sgi__) || defined(__sgi) -#include +#include "xfs/irix.h" #else # error unknown platform... have fun porting! #endif diff --git a/include/project.h b/include/project.h index 328e013bc..a458a6138 100644 --- a/include/project.h +++ b/include/project.h @@ -18,7 +18,7 @@ #ifndef __PROJECT_H__ #define __PROJECT_H__ -#include +#include "xfs/xfs.h" extern int setprojid(const char *__name, int __fd, prid_t __id); extern int getprojid(const char *__name, int __fd, prid_t *__id); diff --git a/include/xfs.h b/include/xfs.h index e32c4a8db..0cb4fb8c7 100644 --- a/include/xfs.h +++ b/include/xfs.h @@ -33,8 +33,8 @@ #ifndef __XFS_H__ #define __XFS_H__ -#include -#include -#include +#include "xfs/platform_defs.h" +#include "xfs/xfs_types.h" +#include "xfs/xfs_fs.h" #endif /* __XFS_H__ */ diff --git a/include/xfs_inode.h b/include/xfs_inode.h index 8acff7be4..303efe0e4 100644 --- a/include/xfs_inode.h +++ b/include/xfs_inode.h @@ -20,8 +20,8 @@ #define __XFS_INODE_H__ /* These match kernel side includes */ -#include -#include +#include "xfs/xfs_inode_buf.h" +#include "xfs/xfs_inode_fork.h" struct xfs_trans; struct xfs_mount; diff --git a/include/xqm.h b/include/xqm.h index 47f58a049..0b5dfa13e 100644 --- a/include/xqm.h +++ b/include/xqm.h @@ -18,7 +18,7 @@ #ifndef __XQM_H__ #define __XQM_H__ -#include +#include "xfs/xfs.h" /* * Disk quota - quotactl(2) commands for the XFS Quota Manager (XQM). diff --git a/io/attr.c b/io/attr.c index 9b26f31e2..dfae36ed4 100644 --- a/io/attr.c +++ b/io/attr.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/bmap.c b/io/bmap.c index a78cbb14b..d96f7d409 100644 --- a/io/bmap.c +++ b/io/bmap.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" #include "init.h" #include "io.h" diff --git a/io/fadvise.c b/io/fadvise.c index a27b8f764..3b76ab9a7 100644 --- a/io/fadvise.c +++ b/io/fadvise.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/fiemap.c b/io/fiemap.c index e76be9762..363d1d9d1 100644 --- a/io/fiemap.c +++ b/io/fiemap.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" #include #include #include "init.h" diff --git a/io/file.c b/io/file.c index 73b893f6d..0eadcab63 100644 --- a/io/file.c +++ b/io/file.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include "init.h" #include "io.h" diff --git a/io/freeze.c b/io/freeze.c index 89cd303c7..a12ed67e6 100644 --- a/io/freeze.c +++ b/io/freeze.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/fsync.c b/io/fsync.c index 5ed8d25a4..d9c45f1c1 100644 --- a/io/fsync.c +++ b/io/fsync.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" #include "init.h" #include "io.h" diff --git a/io/getrusage.c b/io/getrusage.c index 32f2a7ee3..35dc4bfe8 100644 --- a/io/getrusage.c +++ b/io/getrusage.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include #include "init.h" diff --git a/io/imap.c b/io/imap.c index 4f3f88350..a61546769 100644 --- a/io/imap.c +++ b/io/imap.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/init.c b/io/init.c index 1b0751899..78a49b615 100644 --- a/io/init.c +++ b/io/init.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/inject.c b/io/inject.c index 1e078aead..f0aaf97a0 100644 --- a/io/inject.c +++ b/io/inject.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/link.c b/io/link.c index 9c2d1f8c6..092e0d47f 100644 --- a/io/link.c +++ b/io/link.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/madvise.c b/io/madvise.c index 87f619da4..4f3f91bf4 100644 --- a/io/madvise.c +++ b/io/madvise.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include "init.h" #include "io.h" diff --git a/io/mincore.c b/io/mincore.c index eac869967..234e0a106 100644 --- a/io/mincore.c +++ b/io/mincore.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include "init.h" #include "io.h" diff --git a/io/mmap.c b/io/mmap.c index 565a54176..06f678f64 100644 --- a/io/mmap.c +++ b/io/mmap.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include #include "init.h" diff --git a/io/open.c b/io/open.c index c106fa7d4..795adebf3 100644 --- a/io/open.c +++ b/io/open.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/parent.c b/io/parent.c index 0313119fa..e883f6520 100644 --- a/io/parent.c +++ b/io/parent.c @@ -16,13 +16,13 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" +#include "xfs/path.h" +#include "xfs/parent.h" +#include "xfs/handle.h" +#include "xfs/jdm.h" #include "init.h" #include "io.h" diff --git a/io/pread.c b/io/pread.c index cff327575..280cc9d78 100644 --- a/io/pread.c +++ b/io/pread.c @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include "init.h" #include "io.h" diff --git a/io/prealloc.c b/io/prealloc.c index 4ab3d8cc1..e458a9279 100644 --- a/io/prealloc.c +++ b/io/prealloc.c @@ -19,9 +19,9 @@ #if defined(HAVE_FALLOCATE) #include #endif -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/pwrite.c b/io/pwrite.c index 0674c01b2..69f67af93 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/readdir.c b/io/readdir.c index 71332045d..20b889877 100644 --- a/io/readdir.c +++ b/io/readdir.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/resblks.c b/io/resblks.c index 2e5477679..197f7e8a1 100644 --- a/io/resblks.c +++ b/io/resblks.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/seek.c b/io/seek.c index 526b7b823..9b281d5df 100644 --- a/io/seek.c +++ b/io/seek.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include #include "init.h" diff --git a/io/sendfile.c b/io/sendfile.c index 426b75d11..22a5a4f51 100644 --- a/io/sendfile.c +++ b/io/sendfile.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include #include "init.h" #include "io.h" diff --git a/io/shutdown.c b/io/shutdown.c index 21e162632..2c86cf9cb 100644 --- a/io/shutdown.c +++ b/io/shutdown.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/sync.c b/io/sync.c index 683899baf..c7bbbf1a6 100644 --- a/io/sync.c +++ b/io/sync.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" #include "init.h" #include "io.h" diff --git a/io/sync_file_range.c b/io/sync_file_range.c index 35d8cc50d..636633109 100644 --- a/io/sync_file_range.c +++ b/io/sync_file_range.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/io/truncate.c b/io/truncate.c index 49ced6f63..401d2a5f7 100644 --- a/io/truncate.c +++ b/io/truncate.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "io.h" diff --git a/libhandle/handle.c b/libhandle/handle.c index 3c1395a64..54e6f717d 100644 --- a/libhandle/handle.c +++ b/libhandle/handle.c @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/handle.h" +#include "xfs/parent.h" /* just pick a value we know is more than big enough */ #define MAXHANSIZ 64 diff --git a/libhandle/jdm.c b/libhandle/jdm.c index 070407bc7..a18dcd4c1 100644 --- a/libhandle/jdm.c +++ b/libhandle/jdm.c @@ -16,10 +16,10 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/handle.h" +#include "xfs/jdm.h" +#include "xfs/parent.h" /* internal fshandle - typecast to a void for external use */ #define FSHANDLE_SZ 8 diff --git a/libxcmd/command.c b/libxcmd/command.c index ebf141345..148e58b0a 100644 --- a/libxcmd/command.c +++ b/libxcmd/command.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" +#include "xfs/input.h" cmdinfo_t *cmdtab; int ncmds; diff --git a/libxcmd/help.c b/libxcmd/help.c index 54d34d88a..bcd5641a1 100644 --- a/libxcmd/help.c +++ b/libxcmd/help.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" static cmdinfo_t help_cmd; static void help_onecmd(const char *cmd, const cmdinfo_t *ct); diff --git a/libxcmd/input.c b/libxcmd/input.c index c06b5b8fd..83aeeb532 100644 --- a/libxcmd/input.c +++ b/libxcmd/input.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/input.h" #include #include diff --git a/libxcmd/paths.c b/libxcmd/paths.c index 443adbb4c..c0b1ddb97 100644 --- a/libxcmd/paths.c +++ b/libxcmd/paths.c @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include "xfs/path.h" +#include "xfs/input.h" +#include "xfs/project.h" #include extern char *progname; diff --git a/libxcmd/projects.c b/libxcmd/projects.c index a0f5bc989..b00e4c8de 100644 --- a/libxcmd/projects.c +++ b/libxcmd/projects.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include "xfs/project.h" #define PROJID "/etc/projid" #define PROJECT_PATHS "/etc/projects" diff --git a/libxcmd/quit.c b/libxcmd/quit.c index faba4d119..0921bbb75 100644 --- a/libxcmd/quit.c +++ b/libxcmd/quit.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/xfs.h" +#include "xfs/command.h" static cmdinfo_t quit_cmd; diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 72fc4b3af..e0d0dc666 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -58,21 +58,21 @@ (ip)->d_ops, hdr, loghead) #include "libxfs_api_defs.h" -#include +#include "xfs/platform_defs.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "xfs/list.h" +#include "xfs/hlist.h" +#include "xfs/cache.h" +#include "xfs/bitops.h" +#include "xfs/kmem.h" +#include "xfs/radix-tree.h" +#include "xfs/swab.h" +#include "xfs/atomic.h" -#include -#include +#include "xfs/xfs_types.h" +#include "xfs/xfs_arch.h" -#include +#include "xfs/xfs_fs.h" /* CRC stuff, buffer API dependent on it */ extern uint32_t crc32_le(uint32_t crc, unsigned char const *p, size_t len); @@ -81,13 +81,13 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len); #define crc32(c,p,l) crc32_le((c),(unsigned char const *)(p),(l)) #define crc32c(c,p,l) crc32c_le((c),(unsigned char const *)(p),(l)) -#include +#include "xfs/xfs_cksum.h" /* * This mirrors the kernel include for xfs_buf.h - it's implicitly included in * every files via a similar include in the kernel xfs_linux.h. */ -#include +#include "libxfs_io.h" /* for all the support code that uses progname in error messages */ extern char *progname; diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c index c4b69711b..c859f2868 100644 --- a/libxfs/radix-tree.c +++ b/libxfs/radix-tree.c @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include "xfs/platform_defs.h" #include "radix-tree.h" #ifndef ARRAY_SIZE diff --git a/quota/edit.c b/quota/edit.c index cad3aeece..0170d51a6 100644 --- a/quota/edit.c +++ b/quota/edit.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include "xfs/input.h" +#include "xfs/command.h" #include "init.h" #include "quota.h" diff --git a/quota/free.c b/quota/free.c index 79b52e910..72ab50329 100644 --- a/quota/free.c +++ b/quota/free.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/command.h" #include "init.h" #include "quota.h" diff --git a/quota/init.c b/quota/init.c index 639e9e7f5..019e2c56f 100644 --- a/quota/init.c +++ b/quota/init.c @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/path.h" +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" char *progname; diff --git a/quota/path.c b/quota/path.c index 0c204ede0..9a35332d3 100644 --- a/quota/path.c +++ b/quota/path.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "quota.h" diff --git a/quota/project.c b/quota/project.c index a2c7046da..f30c6c645 100644 --- a/quota/project.c +++ b/quota/project.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "xfs/command.h" +#include "xfs/input.h" #include "init.h" #include "quota.h" diff --git a/quota/quot.c b/quota/quot.c index 96d449ea7..be4102636 100644 --- a/quota/quot.c +++ b/quota/quot.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/command.h" #include #include #include diff --git a/quota/quota.c b/quota/quota.c index 367da8ca1..d24974056 100644 --- a/quota/quota.c +++ b/quota/quota.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/command.h" #include #include #include diff --git a/quota/quota.h b/quota/quota.h index 618bb49ec..974747f5a 100644 --- a/quota/quota.h +++ b/quota/quota.h @@ -16,9 +16,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#include "xfs/xqm.h" +#include "xfs/path.h" +#include "xfs/project.h" #include /* diff --git a/quota/report.c b/quota/report.c index 8e3316ed4..7c3cf451e 100644 --- a/quota/report.c +++ b/quota/report.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/command.h" #include #include #include diff --git a/quota/state.c b/quota/state.c index 42bffc017..b1827b6f5 100644 --- a/quota/state.c +++ b/quota/state.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/command.h" #include "init.h" #include "quota.h"