From: Dave Chinner Date: Thu, 30 Jul 2015 23:08:58 +0000 (+1000) Subject: progs: clean up libxlog.h includes X-Git-Tag: v4.2.0-rc1~4^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e708d0facd6c5adc0c2cb508d97527e1a0520777;p=thirdparty%2Fxfsprogs-dev.git progs: clean up libxlog.h includes Convert all the various ways of including libxlog.h to one standard way across all libraries and utilities: #include "xfs/libxlog.h" This means we are consistently including the local include/xfs/libxlog.h header file in parts of the build. Signed-off-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/db/metadump.c b/db/metadump.c index 357ad693b..8ea947b4b 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "bmap.h" #include "command.h" #include "metadump.h" diff --git a/db/sb.c b/db/sb.c index 48c2fb1e3..0e507af35 100644 --- a/db/sb.c +++ b/db/sb.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "command.h" #include "type.h" #include "faddr.h" diff --git a/libxlog/util.c b/libxlog/util.c index 9ef594c22..a0e35ccf1 100644 --- a/libxlog/util.c +++ b/libxlog/util.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" int print_exit; int print_skip_uuid; diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c index 912e0de8c..5cadb2dce 100644 --- a/libxlog/xfs_log_recover.c +++ b/libxlog/xfs_log_recover.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #define xfs_readonly_buftarg(buftarg) (0) diff --git a/logprint/log_copy.c b/logprint/log_copy.c index d8539c83e..ea55a1f0e 100644 --- a/logprint/log_copy.c +++ b/logprint/log_copy.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/logprint/log_dump.c b/logprint/log_dump.c index 96f2912f6..efcf62eb5 100644 --- a/logprint/log_dump.c +++ b/logprint/log_dump.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/logprint/log_misc.c b/logprint/log_misc.c index ccd29a863..269dafebf 100644 --- a/logprint/log_misc.c +++ b/logprint/log_misc.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c index 3d41e6587..bb9032408 100644 --- a/logprint/log_print_all.c +++ b/logprint/log_print_all.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c index 610332659..cbd7a9c65 100644 --- a/logprint/log_print_trans.c +++ b/logprint/log_print_trans.c @@ -16,7 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/logprint/logprint.c b/logprint/logprint.c index 78d92feca..2ad2ec0bf 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -19,7 +19,7 @@ #include #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "logprint.h" diff --git a/repair/phase2.c b/repair/phase2.c index 9fb8b1dda..aee39130d 100644 --- a/repair/phase2.c +++ b/repair/phase2.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "avl.h" #include "globals.h" #include "agheader.h" diff --git a/repair/sb.c b/repair/sb.c index c241f1132..89b4429c0 100644 --- a/repair/sb.c +++ b/repair/sb.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include "agheader.h" #include "globals.h" #include "protos.h" diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index cf8c1becc..1c2f611b2 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -17,7 +17,7 @@ */ #include "xfs/libxfs.h" -#include +#include "xfs/libxlog.h" #include #include "avl.h" #include "avl64.h"