From 6b803e5a17fe559209f9b3e8cb676c229b1752a8 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 31 Jul 2015 14:51:52 +1000 Subject: [PATCH] xfsprogs: simplify internal includes We don't need the xfs/ prefix for local includes if we just add the libxfs directory to the include path. Once that is done we only need to link the installed headers into include/xfs. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- copy/xfs_copy.c | 2 +- db/addr.c | 2 +- db/agf.c | 2 +- db/agfl.c | 2 +- db/agi.c | 2 +- db/attr.c | 2 +- db/attrset.c | 2 +- db/attrshort.c | 2 +- db/bit.c | 2 +- db/block.c | 2 +- db/bmap.c | 2 +- db/bmroot.c | 2 +- db/btblock.c | 2 +- db/check.c | 2 +- db/command.c | 2 +- db/convert.c | 2 +- db/debug.c | 2 +- db/dir2.c | 2 +- db/dir2sf.c | 2 +- db/dquot.c | 2 +- db/echo.c | 2 +- db/faddr.c | 2 +- db/field.c | 2 +- db/flist.c | 2 +- db/fprint.c | 2 +- db/frag.c | 2 +- db/freesp.c | 2 +- db/hash.c | 2 +- db/help.c | 2 +- db/init.c | 2 +- db/inode.c | 2 +- db/input.c | 2 +- db/io.c | 2 +- db/malloc.c | 2 +- db/metadump.c | 4 +- db/output.c | 2 +- db/print.c | 2 +- db/quit.c | 2 +- db/sb.c | 4 +- db/sig.c | 2 +- db/strvec.c | 2 +- db/symlink.c | 2 +- db/text.c | 2 +- db/type.c | 2 +- db/write.c | 2 +- estimate/xfs_estimate.c | 2 +- fsr/xfs_fsr.c | 12 +++--- growfs/xfs_growfs.c | 4 +- include/Makefile | 2 +- include/builddefs.in | 2 +- include/input.h | 2 +- include/libxfs.h | 86 +++++++++++++++++++------------------- include/libxlog.h | 2 +- include/path.h | 2 +- include/project.h | 2 +- include/xfs_inode.h | 4 +- io/attr.c | 6 +-- io/bmap.c | 4 +- io/fadvise.c | 6 +-- io/fiemap.c | 4 +- io/file.c | 6 +-- io/freeze.c | 6 +-- io/fsync.c | 4 +- io/getrusage.c | 6 +-- io/imap.c | 6 +-- io/init.c | 6 +-- io/inject.c | 6 +-- io/link.c | 6 +-- io/madvise.c | 6 +-- io/mincore.c | 6 +-- io/mmap.c | 6 +-- io/open.c | 6 +-- io/parent.c | 14 +++---- io/pread.c | 6 +-- io/prealloc.c | 6 +-- io/pwrite.c | 6 +-- io/readdir.c | 6 +-- io/resblks.c | 6 +-- io/seek.c | 6 +-- io/sendfile.c | 6 +-- io/shutdown.c | 6 +-- io/sync.c | 4 +- io/sync_file_range.c | 6 +-- io/truncate.c | 6 +-- libdisk/drivers.h | 2 +- libhandle/handle.c | 6 +-- libhandle/jdm.c | 8 ++-- libxcmd/command.c | 6 +-- libxcmd/help.c | 4 +- libxcmd/input.c | 4 +- libxcmd/paths.c | 6 +-- libxcmd/projects.c | 2 +- libxcmd/quit.c | 4 +- libxfs/Makefile | 12 ++---- libxfs/crc32.c | 4 +- libxfs/darwin.c | 2 +- libxfs/freebsd.c | 2 +- libxfs/init.c | 2 +- libxfs/irix.c | 2 +- libxfs/libxfs_priv.h | 24 +++++------ libxfs/radix-tree.c | 2 +- libxfs/rdwr.c | 2 +- libxlog/util.c | 4 +- libxlog/xfs_log_recover.c | 4 +- logprint/log_copy.c | 4 +- logprint/log_dump.c | 4 +- logprint/log_misc.c | 4 +- logprint/log_print_all.c | 4 +- logprint/log_print_trans.c | 4 +- logprint/logprint.c | 4 +- mdrestore/xfs_mdrestore.c | 2 +- mkfs/fstyp.c | 2 +- mkfs/maxtrres.c | 2 +- mkfs/proto.c | 2 +- mkfs/xfs_mkfs.c | 2 +- quota/edit.c | 4 +- quota/free.c | 2 +- quota/init.c | 6 +-- quota/path.c | 4 +- quota/project.c | 4 +- quota/quot.c | 2 +- quota/quota.c | 2 +- quota/quota.h | 6 +-- quota/report.c | 2 +- quota/state.c | 2 +- repair/agheader.c | 2 +- repair/attr_repair.c | 2 +- repair/avl.c | 2 +- repair/avl64.c | 2 +- repair/bmap.c | 2 +- repair/btree.c | 2 +- repair/dino_chunks.c | 2 +- repair/dinode.c | 2 +- repair/dir2.c | 2 +- repair/globals.c | 2 +- repair/incore.c | 2 +- repair/incore_bmc.c | 2 +- repair/incore_ext.c | 2 +- repair/incore_ino.c | 2 +- repair/init.c | 2 +- repair/phase1.c | 2 +- repair/phase2.c | 4 +- repair/phase3.c | 2 +- repair/phase4.c | 2 +- repair/phase5.c | 2 +- repair/phase6.c | 2 +- repair/phase7.c | 2 +- repair/prefetch.c | 2 +- repair/progress.c | 2 +- repair/rt.c | 2 +- repair/sb.c | 4 +- repair/scan.c | 2 +- repair/threads.c | 2 +- repair/versions.c | 2 +- repair/xfs_repair.c | 4 +- rtcp/xfs_rtcp.c | 2 +- 156 files changed, 308 insertions(+), 312 deletions(-) diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index 44a32e810..4a5a8a645 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include diff --git a/db/addr.c b/db/addr.c index a3ac5d682..e835dbbf6 100644 --- a/db/addr.c +++ b/db/addr.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "addr.h" #include "command.h" #include "type.h" diff --git a/db/agf.c b/db/agf.c index e144bd65a..e10526ded 100644 --- a/db/agf.c +++ b/db/agf.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/agfl.c b/db/agfl.c index b821b13aa..472873e0a 100644 --- a/db/agfl.c +++ b/db/agfl.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/agi.c b/db/agi.c index 634429e91..285a3c5fc 100644 --- a/db/agi.c +++ b/db/agi.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/attr.c b/db/attr.c index e14e32e97..897834b5f 100644 --- a/db/attr.c +++ b/db/attr.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "bit.h" #include "type.h" #include "faddr.h" diff --git a/db/attrset.c b/db/attrset.c index 1afadd2c7..ec9da5a7b 100644 --- a/db/attrset.c +++ b/db/attrset.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "attrset.h" #include "io.h" diff --git a/db/attrshort.c b/db/attrshort.c index 7dc5640fe..d82559ccf 100644 --- a/db/attrshort.c +++ b/db/attrshort.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/bit.c b/db/bit.c index b85ed6a8e..24872bf7b 100644 --- a/db/bit.c +++ b/db/bit.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "bit.h" #undef setbit /* defined in param.h on Linux */ diff --git a/db/block.c b/db/block.c index 9319cce25..4a357ced0 100644 --- a/db/block.c +++ b/db/block.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "block.h" #include "bmap.h" #include "command.h" diff --git a/db/bmap.c b/db/bmap.c index 60d6a80e1..92057b4f0 100644 --- a/db/bmap.c +++ b/db/bmap.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "fprint.h" diff --git a/db/bmroot.c b/db/bmroot.c index 95be2dd90..0950e191b 100644 --- a/db/bmroot.c +++ b/db/bmroot.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/btblock.c b/db/btblock.c index 1953e05a9..46140fc12 100644 --- a/db/btblock.c +++ b/db/btblock.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/check.c b/db/check.c index c109f2062..afeea32dc 100644 --- a/db/check.c +++ b/db/check.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include "bmap.h" diff --git a/db/command.c b/db/command.c index eb1efb6db..2189e0086 100644 --- a/db/command.c +++ b/db/command.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "addr.h" #include "attrset.h" #include "block.h" diff --git a/db/convert.c b/db/convert.c index d2bf1a955..09f92252a 100644 --- a/db/convert.c +++ b/db/convert.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "convert.h" #include "output.h" diff --git a/db/debug.c b/db/debug.c index 13a319ff9..2875858ca 100644 --- a/db/debug.c +++ b/db/debug.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "debug.h" #include "output.h" diff --git a/db/dir2.c b/db/dir2.c index 75aaed5f8..7f69e6f6c 100644 --- a/db/dir2.c +++ b/db/dir2.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "bit.h" #include "type.h" #include "faddr.h" diff --git a/db/dir2sf.c b/db/dir2sf.c index 831d6f2b4..a56590b0b 100644 --- a/db/dir2sf.c +++ b/db/dir2sf.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/dquot.c b/db/dquot.c index 611825636..3adde3b65 100644 --- a/db/dquot.c +++ b/db/dquot.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "bit.h" #include "bmap.h" #include "command.h" diff --git a/db/echo.c b/db/echo.c index f2b7ab835..9a8ae7299 100644 --- a/db/echo.c +++ b/db/echo.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "echo.h" #include "output.h" diff --git a/db/faddr.c b/db/faddr.c index 17451c268..e368d0da8 100644 --- a/db/faddr.c +++ b/db/faddr.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "fprint.h" #include "faddr.h" diff --git a/db/field.c b/db/field.c index f68809ac5..843c385cb 100644 --- a/db/field.c +++ b/db/field.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/flist.c b/db/flist.c index 848478e74..84065a20a 100644 --- a/db/flist.c +++ b/db/flist.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/fprint.c b/db/fprint.c index f36cdc80f..f2b3794ab 100644 --- a/db/fprint.c +++ b/db/fprint.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include "type.h" diff --git a/db/frag.c b/db/frag.c index 309db7fe6..1cc922eff 100644 --- a/db/frag.c +++ b/db/frag.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "bmap.h" #include "command.h" diff --git a/db/freesp.c b/db/freesp.c index b0fc95ebc..27e9f5a3c 100644 --- a/db/freesp.c +++ b/db/freesp.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "freesp.h" #include "io.h" diff --git a/db/hash.c b/db/hash.c index e02857f12..c535fc9d8 100644 --- a/db/hash.c +++ b/db/hash.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "addr.h" #include "command.h" #include "type.h" diff --git a/db/help.c b/db/help.c index d6a56b094..59a7ba67d 100644 --- a/db/help.c +++ b/db/help.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "help.h" #include "output.h" diff --git a/db/init.c b/db/init.c index 8efd8835c..9537a388f 100644 --- a/db/init.c +++ b/db/init.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "command.h" #include "init.h" diff --git a/db/inode.c b/db/inode.c index e4d80aec9..e86dabdba 100644 --- a/db/inode.c +++ b/db/inode.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/input.c b/db/input.c index ec1b986ca..a90de6c47 100644 --- a/db/input.c +++ b/db/input.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "command.h" #include "input.h" diff --git a/db/io.c b/db/io.c index 0f360a867..9fa52b880 100644 --- a/db/io.c +++ b/db/io.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/malloc.c b/db/malloc.c index 00cbfe137..9037bc140 100644 --- a/db/malloc.c +++ b/db/malloc.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "init.h" #include "malloc.h" #include "output.h" diff --git a/db/metadump.c b/db/metadump.c index 24a79f566..af96e128b 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "bmap.h" #include "command.h" #include "metadump.h" diff --git a/db/output.c b/db/output.c index 8f6e9cda6..14f7c4a9b 100644 --- a/db/output.c +++ b/db/output.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "command.h" #include "output.h" diff --git a/db/print.c b/db/print.c index 9f08b9fa4..3ff2548e9 100644 --- a/db/print.c +++ b/db/print.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/quit.c b/db/quit.c index 7d352a6c9..1103a7aef 100644 --- a/db/quit.c +++ b/db/quit.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "command.h" #include "quit.h" diff --git a/db/sb.c b/db/sb.c index 7305ab96f..1aaa8385d 100644 --- a/db/sb.c +++ b/db/sb.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/sig.c b/db/sig.c index 025c603c7..031567e0a 100644 --- a/db/sig.c +++ b/db/sig.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "sig.h" diff --git a/db/strvec.c b/db/strvec.c index 3fa10bea7..dd8344873 100644 --- a/db/strvec.c +++ b/db/strvec.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "strvec.h" #include "output.h" #include "malloc.h" diff --git a/db/symlink.c b/db/symlink.c index 01719a707..ce9655621 100644 --- a/db/symlink.c +++ b/db/symlink.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/text.c b/db/text.c index a0d4c899a..f6c623cd7 100644 --- a/db/text.c +++ b/db/text.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "block.h" #include "bmap.h" diff --git a/db/type.c b/db/type.c index 07888c486..5c6073691 100644 --- a/db/type.c +++ b/db/type.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "block.h" #include "command.h" #include "type.h" diff --git a/db/write.c b/db/write.c index 6a33dba53..9f5b4234d 100644 --- a/db/write.c +++ b/db/write.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include "bit.h" diff --git a/estimate/xfs_estimate.c b/estimate/xfs_estimate.c index 636691b87..65b7168d9 100644 --- a/estimate/xfs_estimate.c +++ b/estimate/xfs_estimate.c @@ -21,7 +21,7 @@ * * XXX: assumes dirv1 format. */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index efc17a819..7c1d776fa 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -16,12 +16,12 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#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 "libxfs.h" +#include "xfs.h" +#include "xfs_types.h" +#include "jdm.h" +#include "xfs_bmap_btree.h" +#include "xfs_attr_sf.h" #include #include diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index 309b915a6..56315f956 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/path.h" +#include "libxfs.h" +#include "path.h" static void usage(void) diff --git a/include/Makefile b/include/Makefile index 705090a28..46209cea1 100644 --- a/include/Makefile +++ b/include/Makefile @@ -65,7 +65,7 @@ disk: include $(BUILDRULES) # set up include/xfs header directory -install-headers: $(addsuffix -hdrs, $(HFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES)) +install-headers: $(addsuffix -hdrs, $(PHFILES) $(DKHFILES) $(HFILES)) %-hdrs: $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$* diff --git a/include/builddefs.in b/include/builddefs.in index 7e9f53df0..6ee95b783 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -134,7 +134,7 @@ endif GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include + -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs ifeq ($(ENABLE_GETTEXT),yes) GCFLAGS += -DENABLE_GETTEXT diff --git a/include/input.h b/include/input.h index ae273addc..d02170f47 100644 --- a/include/input.h +++ b/include/input.h @@ -21,7 +21,7 @@ #include #include #include -#include "xfs/project.h" +#include "project.h" #include extern char **breakline(char *input, int *count); diff --git a/include/libxfs.h b/include/libxfs.h index eda664f5d..1fb2d6dd5 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -19,26 +19,26 @@ #ifndef __LIBXFS_H__ #define __LIBXFS_H__ -#include "xfs/libxfs_api_defs.h" -#include "xfs/platform_defs.h" +#include "libxfs_api_defs.h" +#include "platform_defs.h" -#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/atomic.h" +#include "list.h" +#include "hlist.h" +#include "cache.h" +#include "bitops.h" +#include "kmem.h" +#include "radix-tree.h" +#include "atomic.h" -#include "xfs/xfs_types.h" -#include "xfs/xfs_fs.h" -#include "xfs/xfs_arch.h" +#include "xfs_types.h" +#include "xfs_fs.h" +#include "xfs_arch.h" -#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" +#include "xfs_shared.h" +#include "xfs_format.h" +#include "xfs_log_format.h" +#include "xfs_quota_defs.h" +#include "xfs_trans_resv.h" /* CRC stuff, buffer API dependent on it */ @@ -48,33 +48,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 "xfs/xfs_cksum.h" +#include "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 "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" +#include "libxfs_io.h" + +#include "xfs_bit.h" +#include "xfs_sb.h" +#include "xfs_mount.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" +#include "xfs_dir2.h" +#include "xfs_bmap_btree.h" +#include "xfs_alloc_btree.h" +#include "xfs_ialloc_btree.h" +#include "xfs_attr_sf.h" +#include "xfs_inode_fork.h" +#include "xfs_inode_buf.h" +#include "xfs_inode.h" +#include "xfs_alloc.h" +#include "xfs_btree.h" +#include "xfs_btree_trace.h" +#include "xfs_bmap.h" +#include "xfs_trace.h" +#include "xfs_trans.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -173,11 +173,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 "xfs/xfs_ialloc.h" +#include "xfs_ialloc.h" -#include "xfs/xfs_attr_leaf.h" -#include "xfs/xfs_attr_remote.h" -#include "xfs/xfs_trans_space.h" +#include "xfs_attr_leaf.h" +#include "xfs_attr_remote.h" +#include "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 0c55a86b9..05b16e8de 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 "xfs/xfs_log_recover.h" +#include "xfs_log_recover.h" /* * macros mapping kernel code to user code diff --git a/include/path.h b/include/path.h index c8746cb98..58955efa8 100644 --- a/include/path.h +++ b/include/path.h @@ -18,7 +18,7 @@ #ifndef __PATH_H__ #define __PATH_H__ -#include "xfs/xfs.h" +#include "xfs.h" /* * XFS Filesystem Paths diff --git a/include/project.h b/include/project.h index a458a6138..63bdffd3e 100644 --- a/include/project.h +++ b/include/project.h @@ -18,7 +18,7 @@ #ifndef __PROJECT_H__ #define __PROJECT_H__ -#include "xfs/xfs.h" +#include "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_inode.h b/include/xfs_inode.h index 303efe0e4..71c0fb48c 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 "xfs/xfs_inode_buf.h" -#include "xfs/xfs_inode_fork.h" +#include "xfs_inode_buf.h" +#include "xfs_inode_fork.h" struct xfs_trans; struct xfs_mount; diff --git a/io/attr.c b/io/attr.c index dfae36ed4..bc1ab56e5 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/bmap.c b/io/bmap.c index d96f7d409..432ddb7fa 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "command.h" #include "init.h" #include "io.h" diff --git a/io/fadvise.c b/io/fadvise.c index 3b76ab9a7..fa586d3e0 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/fiemap.c b/io/fiemap.c index 363d1d9d1..8482c9920 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "command.h" #include #include #include "init.h" diff --git a/io/file.c b/io/file.c index 0eadcab63..91dd38e2f 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include "init.h" #include "io.h" diff --git a/io/freeze.c b/io/freeze.c index a12ed67e6..90f5b664e 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/fsync.c b/io/fsync.c index d9c45f1c1..6c93dffbe 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "command.h" #include "init.h" #include "io.h" diff --git a/io/getrusage.c b/io/getrusage.c index 35dc4bfe8..28b8453d7 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include #include "init.h" diff --git a/io/imap.c b/io/imap.c index a61546769..7c24bcd33 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/init.c b/io/init.c index 78a49b615..70214f9a2 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/inject.c b/io/inject.c index f0aaf97a0..23eb4a208 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/link.c b/io/link.c index 092e0d47f..7fb81e13f 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/madvise.c b/io/madvise.c index 4f3f91bf4..b30d28bab 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include "init.h" #include "io.h" diff --git a/io/mincore.c b/io/mincore.c index 234e0a106..670d4c8d5 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include "init.h" #include "io.h" diff --git a/io/mmap.c b/io/mmap.c index 06f678f64..33747c17d 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include #include "init.h" diff --git a/io/open.c b/io/open.c index 795adebf3..33d9f8dfe 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/parent.c b/io/parent.c index e883f6520..a374b3e9d 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 "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 "xfs.h" +#include "command.h" +#include "input.h" +#include "path.h" +#include "parent.h" +#include "handle.h" +#include "jdm.h" #include "init.h" #include "io.h" diff --git a/io/pread.c b/io/pread.c index 280cc9d78..9205e34e5 100644 --- a/io/pread.c +++ b/io/pread.c @@ -17,9 +17,9 @@ */ #include -#include "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include "init.h" #include "io.h" diff --git a/io/prealloc.c b/io/prealloc.c index e458a9279..b60d2dc58 100644 --- a/io/prealloc.c +++ b/io/prealloc.c @@ -19,9 +19,9 @@ #if defined(HAVE_FALLOCATE) #include #endif -#include "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/pwrite.c b/io/pwrite.c index 69f67af93..c9d2b1ac6 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -17,9 +17,9 @@ */ #include -#include "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/readdir.c b/io/readdir.c index 20b889877..f8b2755dc 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/resblks.c b/io/resblks.c index 197f7e8a1..df032d590 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/seek.c b/io/seek.c index 9b281d5df..39dab61d8 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include #include "init.h" diff --git a/io/sendfile.c b/io/sendfile.c index 22a5a4f51..744b6187f 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include #include "init.h" #include "io.h" diff --git a/io/shutdown.c b/io/shutdown.c index 2c86cf9cb..b75278ada 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/sync.c b/io/sync.c index c7bbbf1a6..0e7b82d91 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "command.h" #include "init.h" #include "io.h" diff --git a/io/sync_file_range.c b/io/sync_file_range.c index 636633109..8e6677359 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/io/truncate.c b/io/truncate.c index 401d2a5f7..5b2ac018b 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" #include "init.h" #include "io.h" diff --git a/libdisk/drivers.h b/libdisk/drivers.h index 22ac1ea17..4d105684f 100644 --- a/libdisk/drivers.h +++ b/libdisk/drivers.h @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include diff --git a/libhandle/handle.c b/libhandle/handle.c index 54e6f717d..7313e3b9c 100644 --- a/libhandle/handle.c +++ b/libhandle/handle.c @@ -17,9 +17,9 @@ */ #include -#include "xfs/xfs.h" -#include "xfs/handle.h" -#include "xfs/parent.h" +#include "xfs.h" +#include "handle.h" +#include "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 2f2f3fd4c..13196d145 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 "xfs/xfs.h" -#include "xfs/handle.h" -#include "xfs/jdm.h" -#include "xfs/parent.h" +#include "xfs.h" +#include "handle.h" +#include "jdm.h" +#include "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 148e58b0a..5d0649b70 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 "xfs/xfs.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "xfs.h" +#include "command.h" +#include "input.h" cmdinfo_t *cmdtab; int ncmds; diff --git a/libxcmd/help.c b/libxcmd/help.c index bcd5641a1..023b83088 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "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 83aeeb532..966a7ff88 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 "xfs/xfs.h" -#include "xfs/input.h" +#include "xfs.h" +#include "input.h" #include #include diff --git a/libxcmd/paths.c b/libxcmd/paths.c index c0b1ddb97..c56b06b9e 100644 --- a/libxcmd/paths.c +++ b/libxcmd/paths.c @@ -24,9 +24,9 @@ #include #include #include -#include "xfs/path.h" -#include "xfs/input.h" -#include "xfs/project.h" +#include "path.h" +#include "input.h" +#include "project.h" #include extern char *progname; diff --git a/libxcmd/projects.c b/libxcmd/projects.c index b00e4c8de..24ef70a11 100644 --- a/libxcmd/projects.c +++ b/libxcmd/projects.c @@ -19,7 +19,7 @@ #include #include #include -#include "xfs/project.h" +#include "project.h" #define PROJID "/etc/projid" #define PROJECT_PATHS "/etc/projects" diff --git a/libxcmd/quit.c b/libxcmd/quit.c index 0921bbb75..0a2dd409a 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 "xfs/xfs.h" -#include "xfs/command.h" +#include "xfs.h" +#include "command.h" static cmdinfo_t quit_cmd; diff --git a/libxfs/Makefile b/libxfs/Makefile index ebbe40ee7..95de27ea0 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile @@ -17,7 +17,7 @@ PKGHFILES = xfs_fs.h \ xfs_format.h \ xfs_log_format.h -LIBHFILES = \ +HFILES = \ xfs_alloc.h \ xfs_alloc_btree.h \ xfs_attr_leaf.h \ @@ -40,11 +40,8 @@ LIBHFILES = \ xfs_trans_resv.h \ xfs_trans_space.h \ libxfs_io.h \ - libxfs_api_defs.h - - -# headers with build dependencies -HFILES = init.h \ + libxfs_api_defs.h \ + init.h \ crc32defs.h \ crc32table.h \ libxfs_priv.h \ @@ -90,7 +87,6 @@ CFILES = cache.c \ CFILES += $(PKG_PLATFORM).c PCFILES = darwin.c freebsd.c irix.c linux.c LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") -LSRCFILES += $(LIBHFILES) LSRCFILES += gen_crc32table.c # @@ -135,7 +131,7 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_INC_DIR) -install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(LIBHFILES)) +install-headers: $(addsuffix -hdrs, $(PKGHFILES)) %-hdrs: $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$* diff --git a/libxfs/crc32.c b/libxfs/crc32.c index 63b1467fc..b2c7ec071 100644 --- a/libxfs/crc32.c +++ b/libxfs/crc32.c @@ -33,8 +33,8 @@ * match the hardware acceleration available on Intel CPUs. */ -#include "xfs/platform_defs.h" -#include "xfs/xfs_arch.h" +#include "platform_defs.h" +#include "xfs_arch.h" #include "crc32defs.h" /* types specifc to this file */ diff --git a/libxfs/darwin.c b/libxfs/darwin.c index f4a38987f..b9c314ffa 100644 --- a/libxfs/darwin.c +++ b/libxfs/darwin.c @@ -21,7 +21,7 @@ #include #include #include -#include "xfs/libxfs.h" +#include "libxfs.h" int platform_has_uuid = 1; extern char *progname; diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c index ec131db23..6c9f089d7 100644 --- a/libxfs/freebsd.c +++ b/libxfs/freebsd.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include diff --git a/libxfs/init.c b/libxfs/init.c index d287c1dc2..2859f94a9 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -31,7 +31,7 @@ #include "xfs_inode.h" #include "xfs_trans.h" -#include "xfs/libxfs.h" /* for now */ +#include "libxfs.h" /* for now */ char *progname = "libxfs"; /* default, changed by each tool */ diff --git a/libxfs/irix.c b/libxfs/irix.c index 69e6d815f..65aaa7ef0 100644 --- a/libxfs/irix.c +++ b/libxfs/irix.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 445a6dc83..7a29fd74e 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -58,20 +58,20 @@ (ip)->d_ops, hdr, loghead) #include "libxfs_api_defs.h" -#include "xfs/platform_defs.h" +#include "platform_defs.h" -#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/atomic.h" +#include "list.h" +#include "hlist.h" +#include "cache.h" +#include "bitops.h" +#include "kmem.h" +#include "radix-tree.h" +#include "atomic.h" -#include "xfs/xfs_types.h" -#include "xfs/xfs_arch.h" +#include "xfs_types.h" +#include "xfs_arch.h" -#include "xfs/xfs_fs.h" +#include "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); @@ -80,7 +80,7 @@ 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 "xfs/xfs_cksum.h" +#include "xfs_cksum.h" /* * This mirrors the kernel include for xfs_buf.h - it's implicitly included in diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c index c859f2868..9e395be15 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 "xfs/platform_defs.h" +#include "platform_defs.h" #include "radix-tree.h" #ifndef ARRAY_SIZE diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 4e0c75b8a..4f8212fe3 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -30,7 +30,7 @@ #include "xfs_inode.h" #include "xfs_trans.h" -#include "xfs/libxfs.h" /* for LIBXFS_EXIT_ON_FAILURE */ +#include "libxfs.h" /* for LIBXFS_EXIT_ON_FAILURE */ /* * Important design/architecture note: diff --git a/libxlog/util.c b/libxlog/util.c index a0e35ccf1..2feae8277 100644 --- a/libxlog/util.c +++ b/libxlog/util.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" int print_exit; int print_skip_uuid; diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c index a80c4313b..ef7cf68b4 100644 --- a/libxlog/xfs_log_recover.c +++ b/libxlog/xfs_log_recover.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #define xfs_readonly_buftarg(buftarg) (0) diff --git a/logprint/log_copy.c b/logprint/log_copy.c index ea55a1f0e..1cc4c211b 100644 --- a/logprint/log_copy.c +++ b/logprint/log_copy.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/logprint/log_dump.c b/logprint/log_dump.c index efcf62eb5..2bccb50fc 100644 --- a/logprint/log_dump.c +++ b/logprint/log_dump.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/logprint/log_misc.c b/logprint/log_misc.c index 7ea6edc8d..fd3067973 100644 --- a/logprint/log_misc.c +++ b/logprint/log_misc.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c index 656996878..9f1a7abf3 100644 --- a/logprint/log_print_all.c +++ b/logprint/log_print_all.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c index cbd7a9c65..9bf2b3762 100644 --- a/logprint/log_print_trans.c +++ b/logprint/log_print_trans.c @@ -15,8 +15,8 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/logprint/logprint.c b/logprint/logprint.c index 2ad2ec0bf..a5c9b324e 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -18,8 +18,8 @@ #include #include -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "logprint.h" diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index ea7298d8d..5764616f9 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "xfs_metadump.h" char *progname; diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c index 741051624..7f3da0659 100644 --- a/mkfs/fstyp.c +++ b/mkfs/fstyp.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include /* diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c index f6bcec0f6..e1d5ee97a 100644 --- a/mkfs/maxtrres.c +++ b/mkfs/maxtrres.c @@ -24,7 +24,7 @@ * directory block size. */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "xfs_mkfs.h" int diff --git a/mkfs/proto.c b/mkfs/proto.c index 17308bc89..cb34b282b 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "xfs_mkfs.h" diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 11e9f4b0c..80cdd10b2 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #ifdef ENABLE_BLKID #include diff --git a/quota/edit.c b/quota/edit.c index 0170d51a6..d226e89b6 100644 --- a/quota/edit.c +++ b/quota/edit.c @@ -19,8 +19,8 @@ #include #include #include -#include "xfs/input.h" -#include "xfs/command.h" +#include "input.h" +#include "command.h" #include "init.h" #include "quota.h" diff --git a/quota/free.c b/quota/free.c index 72ab50329..dcbe8ce05 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 "xfs/command.h" +#include "command.h" #include "init.h" #include "quota.h" diff --git a/quota/init.c b/quota/init.c index 019e2c56f..52f7941b0 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 "xfs/path.h" -#include "xfs/command.h" -#include "xfs/input.h" +#include "path.h" +#include "command.h" +#include "input.h" #include "init.h" char *progname; diff --git a/quota/path.c b/quota/path.c index 9a35332d3..bdb8c98c5 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 "xfs/command.h" -#include "xfs/input.h" +#include "command.h" +#include "input.h" #include "init.h" #include "quota.h" diff --git a/quota/project.c b/quota/project.c index f30c6c645..17a83b04c 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 "xfs/command.h" -#include "xfs/input.h" +#include "command.h" +#include "input.h" #include "init.h" #include "quota.h" diff --git a/quota/quot.c b/quota/quot.c index be4102636..9116e4812 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 "xfs/command.h" +#include "command.h" #include #include #include diff --git a/quota/quota.c b/quota/quota.c index d24974056..f6b24c35c 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 "xfs/command.h" +#include "command.h" #include #include #include diff --git a/quota/quota.h b/quota/quota.h index 974747f5a..a905ce569 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 "xfs/xqm.h" -#include "xfs/path.h" -#include "xfs/project.h" +#include "xqm.h" +#include "path.h" +#include "project.h" #include /* diff --git a/quota/report.c b/quota/report.c index 7c3cf451e..3d8444704 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 "xfs/command.h" +#include "command.h" #include #include #include diff --git a/quota/state.c b/quota/state.c index b1827b6f5..0173f408f 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 "xfs/command.h" +#include "command.h" #include "init.h" #include "quota.h" diff --git a/repair/agheader.c b/repair/agheader.c index a216afa9b..c79031f99 100644 --- a/repair/agheader.c +++ b/repair/agheader.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/attr_repair.c b/repair/attr_repair.c index e2bfd4495..62f80e7ab 100644 --- a/repair/attr_repair.c +++ b/repair/attr_repair.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "globals.h" #include "err_protos.h" #include "attr_repair.h" diff --git a/repair/avl.c b/repair/avl.c index 83e308702..e3843ae6b 100644 --- a/repair/avl.c +++ b/repair/avl.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #define CERT ASSERT diff --git a/repair/avl64.c b/repair/avl64.c index 64f53588e..51cd624c7 100644 --- a/repair/avl64.c +++ b/repair/avl64.c @@ -17,7 +17,7 @@ */ #include -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl64.h" #define CERT ASSERT diff --git a/repair/bmap.c b/repair/bmap.c index c5c50c3b3..26556328c 100644 --- a/repair/bmap.c +++ b/repair/bmap.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "err_protos.h" #include "bmap.h" diff --git a/repair/btree.c b/repair/btree.c index bc4ed989c..66fb40b13 100644 --- a/repair/btree.c +++ b/repair/btree.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "btree.h" /* diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c index d484a1d09..7dbaca667 100644 --- a/repair/dino_chunks.c +++ b/repair/dino_chunks.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/dinode.c b/repair/dinode.c index 09db966c8..c6303fa45 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/dir2.c b/repair/dir2.c index c89f478f4..187e069ce 100644 --- a/repair/dir2.c +++ b/repair/dir2.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/globals.c b/repair/globals.c index d0ca3fb3b..961922005 100644 --- a/repair/globals.c +++ b/repair/globals.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #define EXTERN #include "globals.h" diff --git a/repair/incore.c b/repair/incore.c index d5ecfd6da..cb573165c 100644 --- a/repair/incore.c +++ b/repair/incore.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "btree.h" #include "globals.h" diff --git a/repair/incore_bmc.c b/repair/incore_bmc.c index c1e855d24..de142ee3d 100644 --- a/repair/incore_bmc.c +++ b/repair/incore_bmc.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/incore_ext.c b/repair/incore_ext.c index c15e57de9..cac379c10 100644 --- a/repair/incore_ext.c +++ b/repair/incore_ext.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "btree.h" #include "globals.h" diff --git a/repair/incore_ino.c b/repair/incore_ino.c index 7e19657ef..32d767860 100644 --- a/repair/incore_ino.c +++ b/repair/incore_ino.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/init.c b/repair/init.c index a7547cb8e..609229c8f 100644 --- a/repair/init.c +++ b/repair/init.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/phase1.c b/repair/phase1.c index bd9adcbba..126d0b35b 100644 --- a/repair/phase1.c +++ b/repair/phase1.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/phase2.c b/repair/phase2.c index aee39130d..7e264c41a 100644 --- a/repair/phase2.c +++ b/repair/phase2.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/phase3.c b/repair/phase3.c index 4751e56b9..20786af33 100644 --- a/repair/phase3.c +++ b/repair/phase3.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase4.c b/repair/phase4.c index 8d3525c08..e0571e874 100644 --- a/repair/phase4.c +++ b/repair/phase4.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase5.c b/repair/phase5.c index 9b3d73b91..b9a64b938 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/phase6.c b/repair/phase6.c index 9a5cba7fc..672c6f125 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase7.c b/repair/phase7.c index 56c0379f0..b1e3a5527 100644 --- a/repair/phase7.c +++ b/repair/phase7.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/prefetch.c b/repair/prefetch.c index 08c03945e..8b261ae6b 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -1,4 +1,4 @@ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include "avl.h" #include "btree.h" diff --git a/repair/progress.c b/repair/progress.c index 1b279247e..27cbaefbf 100644 --- a/repair/progress.c +++ b/repair/progress.c @@ -1,5 +1,5 @@ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "globals.h" #include "progress.h" #include "err_protos.h" diff --git a/repair/rt.c b/repair/rt.c index b412a0fcc..3290d2c7a 100644 --- a/repair/rt.c +++ b/repair/rt.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/sb.c b/repair/sb.c index f6a1f151a..4eef14af1 100644 --- a/repair/sb.c +++ b/repair/sb.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include "agheader.h" #include "globals.h" #include "protos.h" diff --git a/repair/scan.c b/repair/scan.c index e9a8ab408..dd6104620 100644 --- a/repair/scan.c +++ b/repair/scan.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/threads.c b/repair/threads.c index a5fb8564f..631531f57 100644 --- a/repair/threads.c +++ b/repair/threads.c @@ -1,4 +1,4 @@ -#include "xfs/libxfs.h" +#include "libxfs.h" #include #include #include "threads.h" diff --git a/repair/versions.c b/repair/versions.c index 0bf4ab3d0..fb1b3e428 100644 --- a/repair/versions.c +++ b/repair/versions.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" #define EXTERN #include "versions.h" diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index df1fd7841..db703d0ef 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -16,8 +16,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" -#include "xfs/libxlog.h" +#include "libxfs.h" +#include "libxlog.h" #include #include "avl.h" #include "avl64.h" diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index 7f48060d2..f604b4640 100644 --- a/rtcp/xfs_rtcp.c +++ b/rtcp/xfs_rtcp.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "xfs/libxfs.h" +#include "libxfs.h" int rtcp(char *, char *, int); int xfsrtextsize(char *path); -- 2.39.2