From: Dave Chinner Date: Thu, 30 Jul 2015 23:07:58 +0000 (+1000) Subject: progs: clean up libxfs.h includes X-Git-Tag: v4.2.0-rc1~4^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b08338d7f92afa87595b1f8b07cc5da3b44e105d;p=thirdparty%2Fxfsprogs-dev.git progs: clean up libxfs.h includes Convert all the various ways of including libxfs.h to one standard way across all libraries and utilities: #include "xfs/libxfs.h" This means we are consistently including the local include/xfs/libxfs.h header file in parts of the build, and means we need to ensure that the include directory is correctly populated before we do any other part of the build. Signed-off-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index b39c84dc3..f76a0e98e 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 +#include "xfs/libxfs.h" #include #include #include diff --git a/db/addr.c b/db/addr.c index 9bea1c7a0..a3ac5d682 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 +#include "xfs/libxfs.h" #include "addr.h" #include "command.h" #include "type.h" diff --git a/db/agf.c b/db/agf.c index d9a07cafb..e144bd65a 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/agfl.c b/db/agfl.c index b29538f58..b821b13aa 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/agi.c b/db/agi.c index 6f167ac48..634429e91 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/attr.c b/db/attr.c index 41c0db070..e14e32e97 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 +#include "xfs/libxfs.h" #include "bit.h" #include "type.h" #include "faddr.h" diff --git a/db/attrset.c b/db/attrset.c index ea5261a1b..1afadd2c7 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 +#include "xfs/libxfs.h" #include "command.h" #include "attrset.h" #include "io.h" diff --git a/db/attrshort.c b/db/attrshort.c index 72f73dd12..7dc5640fe 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/bit.c b/db/bit.c index e8adab376..e604ccac3 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 +#include "xfs/libxfs.h" #include "bit.h" #undef setbit /* defined in param.h on Linux */ diff --git a/db/block.c b/db/block.c index 59a626504..9319cce25 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 +#include "xfs/libxfs.h" #include "block.h" #include "bmap.h" #include "command.h" diff --git a/db/bmap.c b/db/bmap.c index 2a4938044..60d6a80e1 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "fprint.h" diff --git a/db/bmroot.c b/db/bmroot.c index e2194aa1a..95be2dd90 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/btblock.c b/db/btblock.c index cdb8b1df2..742f09b1e 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/check.c b/db/check.c index 01f5b6e4d..ce98360f4 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 +#include "xfs/libxfs.h" #include #include #include "bmap.h" diff --git a/db/command.c b/db/command.c index b7e316593..eb1efb6db 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 +#include "xfs/libxfs.h" #include "addr.h" #include "attrset.h" #include "block.h" diff --git a/db/convert.c b/db/convert.c index de4bfbf53..d2bf1a955 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 +#include "xfs/libxfs.h" #include "command.h" #include "convert.h" #include "output.h" diff --git a/db/debug.c b/db/debug.c index 07a2482bb..13a319ff9 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 +#include "xfs/libxfs.h" #include "command.h" #include "debug.h" #include "output.h" diff --git a/db/dir2.c b/db/dir2.c index 18a54b6a1..75aaed5f8 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 +#include "xfs/libxfs.h" #include "bit.h" #include "type.h" #include "faddr.h" diff --git a/db/dir2sf.c b/db/dir2sf.c index bbe608014..831d6f2b4 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/dquot.c b/db/dquot.c index 2f7d463e0..611825636 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 +#include "xfs/libxfs.h" #include "bit.h" #include "bmap.h" #include "command.h" diff --git a/db/echo.c b/db/echo.c index 813187bdf..f2b7ab835 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 +#include "xfs/libxfs.h" #include "command.h" #include "echo.h" #include "output.h" diff --git a/db/faddr.c b/db/faddr.c index d40717da8..17451c268 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 +#include "xfs/libxfs.h" #include "type.h" #include "fprint.h" #include "faddr.h" diff --git a/db/field.c b/db/field.c index 816065e74..50a53d145 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/flist.c b/db/flist.c index 33f7da760..848478e74 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/fprint.c b/db/fprint.c index 52782e24b..f36cdc80f 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 +#include "xfs/libxfs.h" #include #include #include "type.h" diff --git a/db/frag.c b/db/frag.c index d8ad25eb2..309db7fe6 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 +#include "xfs/libxfs.h" #include #include "bmap.h" #include "command.h" diff --git a/db/freesp.c b/db/freesp.c index 361fa96da..b0fc95ebc 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 +#include "xfs/libxfs.h" #include "command.h" #include "freesp.h" #include "io.h" diff --git a/db/hash.c b/db/hash.c index 02376e60c..4c49a662e 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 +#include "xfs/libxfs.h" #include "addr.h" #include "command.h" #include "type.h" diff --git a/db/help.c b/db/help.c index 79131003c..d6a56b094 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 +#include "xfs/libxfs.h" #include "command.h" #include "help.h" #include "output.h" diff --git a/db/init.c b/db/init.c index e7f536a84..54e6535f5 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 +#include "xfs/libxfs.h" #include #include "command.h" #include "init.h" diff --git a/db/inode.c b/db/inode.c index fbae0bdcb..e4d80aec9 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/input.c b/db/input.c index b73a1f81b..ec1b986ca 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 +#include "xfs/libxfs.h" #include #include "command.h" #include "input.h" diff --git a/db/io.c b/db/io.c index b55a5fb60..0f360a867 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/malloc.c b/db/malloc.c index fe1eacfa0..00cbfe137 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 +#include "xfs/libxfs.h" #include "init.h" #include "malloc.h" #include "output.h" diff --git a/db/metadump.c b/db/metadump.c index 1543b5220..357ad693b 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "bmap.h" #include "command.h" diff --git a/db/output.c b/db/output.c index 36669f481..8f6e9cda6 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 +#include "xfs/libxfs.h" #include #include "command.h" #include "output.h" diff --git a/db/print.c b/db/print.c index b865d643c..9f08b9fa4 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 +#include "xfs/libxfs.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/db/quit.c b/db/quit.c index 5e4413c25..7d352a6c9 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 +#include "xfs/libxfs.h" #include "command.h" #include "quit.h" diff --git a/db/sb.c b/db/sb.c index 2be28d078..48c2fb1e3 100644 --- a/db/sb.c +++ b/db/sb.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "command.h" #include "type.h" diff --git a/db/sig.c b/db/sig.c index 338c70687..025c603c7 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 +#include "xfs/libxfs.h" #include #include "sig.h" diff --git a/db/strvec.c b/db/strvec.c index 8aa4e3451..3fa10bea7 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 +#include "xfs/libxfs.h" #include "strvec.h" #include "output.h" #include "malloc.h" diff --git a/db/symlink.c b/db/symlink.c index a4f420f49..01719a707 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 +#include "xfs/libxfs.h" #include "type.h" #include "faddr.h" #include "fprint.h" diff --git a/db/text.c b/db/text.c index 12084a2b3..a0d4c899a 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 +#include "xfs/libxfs.h" #include #include "block.h" #include "bmap.h" diff --git a/db/type.c b/db/type.c index 0aa3137f5..5eab69145 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 +#include "xfs/libxfs.h" #include "block.h" #include "command.h" #include "type.h" diff --git a/db/write.c b/db/write.c index 655b6188d..6a33dba53 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 +#include "xfs/libxfs.h" #include #include #include "bit.h" diff --git a/debian/rules b/debian/rules index 2be2773ce..27b043fa9 100755 --- a/debian/rules +++ b/debian/rules @@ -44,6 +44,9 @@ dibuild: @echo "== dpkg-buildpackage: installer" 1>&2 if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \ $(diopts) $(MAKE) include/platform_defs.h; \ + for dir in include libxfs; do \ + $(MAKE) -C $$dir NODEP=1 install-headers; \ + done; \ for dir in include libxfs libdisk mkfs; do \ $(MAKE) -C $$dir; \ done; \ diff --git a/estimate/xfs_estimate.c b/estimate/xfs_estimate.c index c574a08a0..636691b87 100644 --- a/estimate/xfs_estimate.c +++ b/estimate/xfs_estimate.c @@ -21,7 +21,7 @@ * * XXX: assumes dirv1 format. */ -#include +#include "xfs/libxfs.h" #include #include diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 2fc94c784..89fba5584 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include #include diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index 8e611b6b0..3ff3b5dbf 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include static void diff --git a/include/Makefile b/include/Makefile index a0a6554d6..91b33b073 100644 --- a/include/Makefile +++ b/include/Makefile @@ -54,14 +54,16 @@ LSRCFILES += $(DKHFILES) $(LIBHFILES) LDIRT = disk LDIRDIRT = xfs -default install: disk +default: disk disk: @echo " [LN] $@" $(Q)$(LN_S) . $@ +include $(BUILDRULES) + # set up include/xfs header directory -headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES)) +install-headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES)) %-hdrs: xfs $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$* @@ -69,11 +71,10 @@ headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHF xfs: @mkdir -p xfs - -include $(BUILDRULES) - -install-dev: default +install: default $(INSTALL) -m 755 -d $(PKG_INC_DIR) + +install-dev: install $(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR) install-qa: install-dev diff --git a/include/buildrules b/include/buildrules index 1c9fe2819..0e13f9da8 100644 --- a/include/buildrules +++ b/include/buildrules @@ -13,10 +13,12 @@ clean clobber : $(addsuffix -clean,$(SUBDIRS)) @echo "Cleaning $*" $(Q)$(MAKE) $(MAKEOPTS) -C $* clean +ifdef HDR_SUBDIRS headers: $(addsuffix -headers, $(HDR_SUBDIRS)) %-headers: @echo " [HEADERS] $*" - $(Q)$(MAKE) $(MAKEOPTS) -C $* headers + $(Q)$(MAKE) $(MAKEOPTS) -C $* NODEP=1 install-headers +endif # Never blow away subdirs ifdef SUBDIRS diff --git a/libdisk/drivers.h b/libdisk/drivers.h index 4ede58b08..22ac1ea17 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 +#include "xfs/libxfs.h" #include #include diff --git a/libxfs/Makefile b/libxfs/Makefile index afd0af3d4..56756024e 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile @@ -121,14 +121,15 @@ crc32selftest: gen_crc32table.c crc32table.h crc32.c $(Q) ./$@ # set up include/xfs header directory -headers: $(addsuffix -hdrs, $(PKGHFILES) $(QAHFILES)) - -%-hdrs: - $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$* - include $(BUILDRULES) install: default + $(INSTALL) -m 755 -d $(PKG_INC_DIR) + +install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(QAHFILES)) + +%-hdrs: + $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$* install-dev: install $(INSTALL) -m 644 $(PKGHFILES) $(HFILES) $(PKG_INC_DIR) @@ -136,5 +137,13 @@ install-dev: install install-qa: install-dev $(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR) +# We need to install the headers before building the dependencies. If we +# include the .ltdep file, the makefile decides that it needs to build the +# dependencies to remake the makefile before running the header install target, +# hence making it impossible to avoid errors being thrown by the dependency +# generation. Hence we play games so that we only include this file if we aren't +# running the install-headers target. +ifndef NODEP -include .ltdep +endif diff --git a/libxfs/darwin.c b/libxfs/darwin.c index ad0b05b4e..f4a38987f 100644 --- a/libxfs/darwin.c +++ b/libxfs/darwin.c @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include "xfs/libxfs.h" int platform_has_uuid = 1; extern char *progname; diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c index 5bb7acb35..ec131db23 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 +#include "xfs/libxfs.h" #include #include #include diff --git a/libxfs/init.c b/libxfs/init.c index 6f404aaa8..d287c1dc2 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -31,7 +31,7 @@ #include "xfs_inode.h" #include "xfs_trans.h" -#include /* for now */ +#include "xfs/libxfs.h" /* for now */ char *progname = "libxfs"; /* default, changed by each tool */ diff --git a/libxfs/irix.c b/libxfs/irix.c index 1dcb4f602..69e6d815f 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 +#include "xfs/libxfs.h" #include #include diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index cb172064f..61c0d6b2a 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -30,7 +30,7 @@ #include "xfs_inode.h" #include "xfs_trans.h" -#include /* for LIBXFS_EXIT_ON_FAILURE */ +#include "xfs/libxfs.h" /* for LIBXFS_EXIT_ON_FAILURE */ /* * Important design/architecture note: diff --git a/libxlog/util.c b/libxlog/util.c index 498c06ce6..9ef594c22 100644 --- a/libxlog/util.c +++ b/libxlog/util.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include int print_exit; diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c index cc8aff8d1..912e0de8c 100644 --- a/libxlog/xfs_log_recover.c +++ b/libxlog/xfs_log_recover.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #define xfs_readonly_buftarg(buftarg) (0) diff --git a/logprint/log_copy.c b/logprint/log_copy.c index 1517846fa..d8539c83e 100644 --- a/logprint/log_copy.c +++ b/logprint/log_copy.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/logprint/log_dump.c b/logprint/log_dump.c index dcecb44b1..96f2912f6 100644 --- a/logprint/log_dump.c +++ b/logprint/log_dump.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/logprint/log_misc.c b/logprint/log_misc.c index 521ab66a6..ccd29a863 100644 --- a/logprint/log_misc.c +++ b/logprint/log_misc.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c index a02c71a0f..3d41e6587 100644 --- a/logprint/log_print_all.c +++ b/logprint/log_print_all.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c index 0911b6fad..610332659 100644 --- a/logprint/log_print_trans.c +++ b/logprint/log_print_trans.c @@ -15,7 +15,7 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/logprint/logprint.c b/logprint/logprint.c index fdf106b96..78d92feca 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -18,7 +18,7 @@ #include #include -#include +#include "xfs/libxfs.h" #include #include "logprint.h" diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index f3c846ece..ea7298d8d 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 +#include "xfs/libxfs.h" #include "xfs_metadump.h" char *progname; diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c index e91b947fc..741051624 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 +#include "xfs/libxfs.h" #include /* diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c index 66a6c14d4..f6bcec0f6 100644 --- a/mkfs/maxtrres.c +++ b/mkfs/maxtrres.c @@ -24,7 +24,7 @@ * directory block size. */ -#include +#include "xfs/libxfs.h" #include "xfs_mkfs.h" int diff --git a/mkfs/proto.c b/mkfs/proto.c index 45565b7a6..b69ff1ba4 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 +#include "xfs/libxfs.h" #include #include "xfs_mkfs.h" diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index e66350b3b..e14f06dd0 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 +#include "xfs/libxfs.h" #include #ifdef ENABLE_BLKID #include diff --git a/repair/agheader.c b/repair/agheader.c index 9ae2deb36..0989597b3 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 +#include "xfs/libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/attr_repair.c b/repair/attr_repair.c index f3332b3d1..3e441639b 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 +#include "xfs/libxfs.h" #include "globals.h" #include "err_protos.h" #include "attr_repair.h" diff --git a/repair/avl.c b/repair/avl.c index eabecc3f8..7f3616672 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 +#include "xfs/libxfs.h" #include "avl.h" #define CERT ASSERT diff --git a/repair/avl64.c b/repair/avl64.c index c135da322..54038fc03 100644 --- a/repair/avl64.c +++ b/repair/avl64.c @@ -17,7 +17,7 @@ */ #include -#include +#include "xfs/libxfs.h" #include "avl64.h" #define CERT ASSERT diff --git a/repair/bmap.c b/repair/bmap.c index 71568f4fd..c5c50c3b3 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 +#include "xfs/libxfs.h" #include "err_protos.h" #include "bmap.h" diff --git a/repair/btree.c b/repair/btree.c index 2beb75ae6..bc4ed989c 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 +#include "xfs/libxfs.h" #include "btree.h" /* diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c index a1ce9e71b..f600ac25c 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/dinode.c b/repair/dinode.c index 179203ee1..09db966c8 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/dir2.c b/repair/dir2.c index ceb8825cd..3c4d9bd9e 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/globals.c b/repair/globals.c index b588d033e..d0ca3fb3b 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 +#include "xfs/libxfs.h" #define EXTERN #include "globals.h" diff --git a/repair/incore.c b/repair/incore.c index cf1073f78..d5ecfd6da 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 +#include "xfs/libxfs.h" #include "avl.h" #include "btree.h" #include "globals.h" diff --git a/repair/incore_bmc.c b/repair/incore_bmc.c index 1bc5fd92e..c1e855d24 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/incore_ext.c b/repair/incore_ext.c index 826bf44b2..843e69d99 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 +#include "xfs/libxfs.h" #include "avl.h" #include "btree.h" #include "globals.h" diff --git a/repair/incore_ino.c b/repair/incore_ino.c index 95026481c..0f3deebd7 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "incore.h" diff --git a/repair/init.c b/repair/init.c index d0940aaef..a7547cb8e 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 +#include "xfs/libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/phase1.c b/repair/phase1.c index 9e7011db5..bd9adcbba 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 +#include "xfs/libxfs.h" #include "globals.h" #include "agheader.h" #include "protos.h" diff --git a/repair/phase2.c b/repair/phase2.c index 983aaa761..9fb8b1dda 100644 --- a/repair/phase2.c +++ b/repair/phase2.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "avl.h" #include "globals.h" diff --git a/repair/phase3.c b/repair/phase3.c index 213d36844..4751e56b9 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 +#include "xfs/libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase4.c b/repair/phase4.c index aa79ae017..8d3525c08 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 +#include "xfs/libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase5.c b/repair/phase5.c index 1ce57a142..e34740f58 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/phase6.c b/repair/phase6.c index 130ed4f1b..1e0b4c294 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 +#include "xfs/libxfs.h" #include "threads.h" #include "prefetch.h" #include "avl.h" diff --git a/repair/phase7.c b/repair/phase7.c index becacf83f..fe4a84aec 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/prefetch.c b/repair/prefetch.c index d6246ce3c..45b1ffeeb 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -1,4 +1,4 @@ -#include +#include "xfs/libxfs.h" #include #include "avl.h" #include "btree.h" diff --git a/repair/progress.c b/repair/progress.c index 45a412e45..1b279247e 100644 --- a/repair/progress.c +++ b/repair/progress.c @@ -1,5 +1,5 @@ -#include +#include "xfs/libxfs.h" #include "globals.h" #include "progress.h" #include "err_protos.h" diff --git a/repair/rt.c b/repair/rt.c index 3a488c869..b412a0fcc 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/sb.c b/repair/sb.c index 03be5e851..c241f1132 100644 --- a/repair/sb.c +++ b/repair/sb.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include "agheader.h" #include "globals.h" diff --git a/repair/scan.c b/repair/scan.c index 9c9be6893..881de9ec4 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 +#include "xfs/libxfs.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/threads.c b/repair/threads.c index d10b841f3..a5fb8564f 100644 --- a/repair/threads.c +++ b/repair/threads.c @@ -1,4 +1,4 @@ -#include +#include "xfs/libxfs.h" #include #include #include "threads.h" diff --git a/repair/versions.c b/repair/versions.c index e176779be..0bf4ab3d0 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 +#include "xfs/libxfs.h" #define EXTERN #include "versions.h" diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index 8cb06b35a..cf8c1becc 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "xfs/libxfs.h" #include #include #include "avl.h" diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index 5f26a62e0..08a02b3a8 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 +#include "xfs/libxfs.h" int rtcp(char *, char *, int); int xfsrtextsize(char *path);