Fix includes to not be relative to paths provided by -I directives, for

the xfsprogs and xfsdump builds.  At this stage still provide these gcc
options in the build but later that can be removed too now that headers
are clean.

diff --git a/db/addr.c b/db/addr.c
index cab213a63c28199d1dcc1cc7fff66d23d2ece92f..8f8957ca320ca81acacfb9723c05d5ab3848b1b8 100644 (file)
--- a/db/addr.c
+++ b/db/addr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/agf.c b/db/agf.c
index cbbe97248d8eb1cac59632c4ff43bf99dd3acd80..def6beaca2909b46e5f734679762b8aafa949b52 100644 (file)
--- a/db/agf.c
+++ b/db/agf.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agf.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/agfl.c b/db/agfl.c
index 819d1f01f1ec63ebf3234443e77a8b3105de9ceb..4bc9c5894fbc3af524afdd91442bc73106cf920d 100644 (file)
--- a/db/agfl.c
+++ b/db/agfl.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agfl.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/agi.c b/db/agi.c
index 0b7c24b90125514a4924de28fcd889a28a5bbf32..5fbcafbeb5f208f1f589546600e93939d81d5e6e 100644 (file)
--- a/db/agi.c
+++ b/db/agi.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agi.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/attr.c b/db/attr.c
index 9d512f947259bfd80dc3e83c0d1e41ffe78c3c0e..f9d76e20292c01a95c77e06230debe5ac00f18ca 100644 (file)
--- a/db/attr.c
+++ b/db/attr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/attrshort.c b/db/attrshort.c
index bdbed1a678da97654bc465dd77657703a8b68461..93778f73593a0e86071d97fa05c457df9cd486b0 100644 (file)
--- a/db/attrshort.c
+++ b/db/attrshort.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/bit.c b/db/bit.c
index 3791d7e813083efc70f67eb0089fae0819b15573..57b408d5dbfd272a9305b9cc4821faa171415ee6 100644 (file)
--- a/db/bit.c
+++ b/db/bit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#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 2f3dec5537fe5de16d8da592eb3fe132fd015b22..ff3e69371aeb652e2fd9f4de8c704b09773568f3 100644 (file)
--- a/db/block.c
+++ b/db/block.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "block.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/bmap.c b/db/bmap.c
index 6b686f36407a509a4c5bc332ee7be546514f4326..b9a3e38e2db4d9916a6c8efdc59770052aef4a9b 100644 (file)
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "bmap.h"

diff --git a/db/bmapbt.c b/db/bmapbt.c
index 1dba5575ad78c639560159064caec8f3caed367a..4c72133fcf673d26aaea0061e9f71593b1745478 100644 (file)
--- a/db/bmapbt.c
+++ b/db/bmapbt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/bmroot.c b/db/bmroot.c
index 4f99d189b561b2f5905d358853d974949bb64938..efe52ecedc5da50ddda8adfd10f1cbdde1cac5ae 100644 (file)
--- a/db/bmroot.c
+++ b/db/bmroot.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/bnobt.c b/db/bnobt.c
index b53c51db7b50bbe8a7248a1048c6c4fd562752fb..fa99dc9705da20fdb2c5d1a765232edb0cd82c9a 100644 (file)
--- a/db/bnobt.c
+++ b/db/bnobt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/check.c b/db/check.c
index fd4186331fbdfdc0d7e7372dcb33b262342ddc9b..e13a68bffb56e69c0f71ca9ab5f03c5f6c817b74 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <math.h>
 #include <sys/time.h>
 #include "bmap.h"

diff --git a/db/cntbt.c b/db/cntbt.c
index b241daf4a328a9bd1f2a980765858c35fdd52330..a790ef648c7c335dbdf0057213877b108613af07 100644 (file)
--- a/db/cntbt.c
+++ b/db/cntbt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/command.c b/db/command.c
index c23fd04bf20443046c3998a8c9d36a10fffd524d..0571101e4330d0f70b9fd8a88103b4834b4fa8fd 100644 (file)
--- a/db/command.c
+++ b/db/command.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "agf.h"
 #include "agfl.h"

diff --git a/db/convert.c b/db/convert.c
index 357777fac23530bdcfdd84ad6f2eb44be1582947..0fdaae6eb9810cff446b0e50846a96b6db9b5180 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "convert.h"
 #include "output.h"

diff --git a/db/dbread.c b/db/dbread.c
index d1ddeb9b21e2d65e7bdd9a6c40fbc8a892bd8d12..411667b4273e1b16f9b6b35a3659afdcf5124500 100644 (file)
--- a/db/dbread.c
+++ b/db/dbread.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bmap.h"
 #include "dbread.h"
 #include "io.h"

diff --git a/db/debug.c b/db/debug.c
index 6d1867a08172e9079c74ca4081eae2d22927b7b2..0c1937b4785dd71977e72e7506969a216d44f84c 100644 (file)
--- a/db/debug.c
+++ b/db/debug.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "debug.h"
 #include "output.h"

diff --git a/db/dir.c b/db/dir.c
index 23458b6110c3946f27c215dddd430f9bcd07e15b..5c2512aefb1031b6eebbddc5701970b665d8c09f 100644 (file)
--- a/db/dir.c
+++ b/db/dir.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/dir2.c b/db/dir2.c
index 8c48e54a5d0afb6dd327c9279b2b0f61c13b6eb7..5f6e512bd9b2fe4f56e9e6876b5b8b0e2dd880e2 100644 (file)
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/dir2sf.c b/db/dir2sf.c
index cd0a2c9edae1a23584591de1a92bea7d3a894e37..b9953dae8e127d12ae9b0794dbf2c63dd52b33e5 100644 (file)
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/dirshort.c b/db/dirshort.c
index 041a35070af3f3b45e1f0084f20cf8a91b781d09..404a6ec0f36116535a99210fd1dd44e9eb06f3ba 100644 (file)
--- a/db/dirshort.c
+++ b/db/dirshort.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/dquot.c b/db/dquot.c
index 774068028456149ad53eff61791a524a70732dec..6795d0a60caa26e3fbdc19b0b85240f7aceb8682 100644 (file)
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "bit.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/echo.c b/db/echo.c
index d939114ced4e7bcb3a64b0f76945bc6549b55499..43002e8ee241054d1d81456f9d9578b008eec283 100644 (file)
--- a/db/echo.c
+++ b/db/echo.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "echo.h"
 #include "output.h"

diff --git a/db/faddr.c b/db/faddr.c
index 61a310cc2282f61b0b1db9f7d6da906fdd81aff7..ad829ff55f4e10bb6fa69e562e3aba8ee486d5b2 100644 (file)
--- a/db/faddr.c
+++ b/db/faddr.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "inode.h"

diff --git a/db/field.c b/db/field.c
index fd56668d4d3209cd7f8e6f27f0de3afe325b6033..e8491766c141aadc4bdcefe09ce050e14c2ef51a 100644 (file)
--- a/db/field.c
+++ b/db/field.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/flist.c b/db/flist.c
index e566097f6bb7ee9d1d329b78a4935b199b97c7c8..2e5cced08eca47f5757aee4d0f4bea40a5099034 100644 (file)
--- a/db/flist.c
+++ b/db/flist.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/fprint.c b/db/fprint.c
index e5bf2e7cd371bce5ea4721d085819e6f2f15906a..e92ac33d4004008869268aba67fed80106827d52 100644 (file)
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include <time.h>
 #include "type.h"

diff --git a/db/frag.c b/db/frag.c
index d0b3a8c0b79160143b781a1a7d0b8946eeeeef61..1c61bd9bf5ce5718b75af3c742f8e0ff629abcc6 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/time.h>
 #include "bmap.h"
 #include "command.h"

diff --git a/db/freesp.c b/db/freesp.c
index bdbcc4e5f32a4fed1ea7423a6efaed608223fcdf..d8c10ff9d155c18727b991136cd7a2f0d034b4d9 100644 (file)
--- a/db/freesp.c
+++ b/db/freesp.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "freesp.h"
 #include "io.h"

diff --git a/db/hash.c b/db/hash.c
index 8174652c5259fa810041ac1328967a8e8187ea73..f58aea41096d1ed969894e991e7eade8f77373e5 100644 (file)
--- a/db/hash.c
+++ b/db/hash.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/help.c b/db/help.c
index 0f0aa22ccaac12aab082c7ae937acd3bf517b58f..8dfcb6e1923411c2743228a8b78eadb4ded48e72 100644 (file)
--- a/db/help.c
+++ b/db/help.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "help.h"
 #include "output.h"

diff --git a/db/init.c b/db/init.c
index 4a684362c956b8501dfea93e226fd5df22b2c0ac..520fc653a0e07ca42e7974e1a9fbf3d39ba72799 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "command.h"
 #include "init.h"

diff --git a/db/inobt.c b/db/inobt.c
index e170c3fcb7581737851d5430ddac1f39c4f51fe6..861f3557dbdbc7af2f336eaedb910bdbd7fe2bc9 100644 (file)
--- a/db/inobt.c
+++ b/db/inobt.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/inode.c b/db/inode.c
index 844b833cef2e8b5421191306e2aab6bcb9412f3c..fa1e4ec5e92a7dfe423f4ede1ff319800516eb2d 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/input.c b/db/input.c
index 3d828d9249adcaff62797b4035ae49e66183ba57..a3b1f70f5d81d0a946769668699ac2b174da875b 100644 (file)
--- a/db/input.c
+++ b/db/input.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "command.h"
 #include "input.h"

diff --git a/db/io.c b/db/io.c
index 53ab569613641a8f68ae511de4da908f9b3044e5..7bd4dae1ebd9f61d6f43a957b23851607a58c8f8 100644 (file)
--- a/db/io.c
+++ b/db/io.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/malloc.c b/db/malloc.c
index 9811c2147990d48dbafbe4831d7959f8c6564050..708b059823ac80d8becf7df8c24d8f737a1c8975 100644 (file)
--- a/db/malloc.c
+++ b/db/malloc.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "init.h"
 #include "malloc.h"
 #include "output.h"

diff --git a/db/output.c b/db/output.c
index d8e5510e0093799ea56d52260edcd2f678280b1c..0298e80486f711c208c24898c7bb5a08c0528cce 100644 (file)
--- a/db/output.c
+++ b/db/output.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <stdarg.h>
 #include "command.h"
 #include "output.h"

diff --git a/db/print.c b/db/print.c
index b30b2957eb64969b552fcedec79913f117b305b7..fe87999f37a4404a0c731ea7b9c4f45fe3b74146 100644 (file)
--- a/db/print.c
+++ b/db/print.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/quit.c b/db/quit.c
index 5dbeb7299f2f32fa653d8e03c59592ec848b1dea..4207f4bafab0e4b4421f8fd22c45d4531fef2f36 100644 (file)
--- a/db/quit.c
+++ b/db/quit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "quit.h"
 

diff --git a/db/sb.c b/db/sb.c
index 26739839c98fa24fbbafdcb6c9e63471b99ed1e8..5259b21558ad3e27eb7c7b18b47da3b65a987a46 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <libxlog.h>
+#include <xfs/libxfs.h>
+#include <xfs/libxlog.h>
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/sig.c b/db/sig.c
index 7c17f195700b715718a30ff3abf27879a7a84a47..f73c26675efdb23f704817f704e4d99d07c32039 100644 (file)
--- a/db/sig.c
+++ b/db/sig.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <signal.h>
 #include "sig.h"
 

diff --git a/db/strvec.c b/db/strvec.c
index a85eaf56cd3eb7250857ecf2b49e4b76f218e15e..107698a091de97363bfcd91c8cd5e436ed52a809 100644 (file)
--- a/db/strvec.c
+++ b/db/strvec.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "strvec.h"
 #include "output.h"
 #include "malloc.h"

diff --git a/db/text.c b/db/text.c
index 777120020ce5147b53181969bc775903ba3a538b..d5c570d1160dfeeee276ff47cd440caa3e4673dc 100644 (file)
--- a/db/text.c
+++ b/db/text.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include "block.h"
 #include "bmap.h"

diff --git a/db/type.c b/db/type.c
index f774c3b47d72eb36d2cd39882024f482c0757f11..5b30fb30bdddcb319eb0bf088b16e8fb097694c0 100644 (file)
--- a/db/type.c
+++ b/db/type.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "agf.h"
 #include "agfl.h"
 #include "agi.h"

diff --git a/db/write.c b/db/write.c
index 37675dc9486a5a615bbdc1840a279ada5231d821..f4acb730f829fcceec68094c3c1315aabd23cba3 100644 (file)
--- a/db/write.c
+++ b/db/write.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include <time.h>
 #include "bit.h"

diff --git a/freeze/xfs_freeze.c b/freeze/xfs_freeze.c
index a4403b341f99dfb3a7ffede507aad964f602db07..63973fa961079c4b0f76b24fcbe2556b13ee4d3f 100644 (file)
--- a/freeze/xfs_freeze.c
+++ b/freeze/xfs_freeze.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 char   *progname;
 

diff --git a/growfs/explore.c b/growfs/explore.c
index 530d250f8533265363e4e5f448f1fbccecac21f3..ba6e4f72b00408f9bd540fd4978ae6024562e81f 100644 (file)
--- a/growfs/explore.c
+++ b/growfs/explore.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <mntent.h>
 
 extern char    *fname;         /* mount point name */

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index c579e8111020ced81705587bd9c5e9097ccd757e..ed96e855568fc6bc6cd980a0bb7d476dac4d22fd 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "explore.h"
 
 /*

diff --git a/imap/xfs_imap.c b/imap/xfs_imap.c
index f23db6c593581f88c8ebf0bbe2f22c254b41781c..7e193bd863c66d88d448f44a3ed5b4244f27f129 100644 (file)
--- a/imap/xfs_imap.c
+++ b/imap/xfs_imap.c
@@ -34,7 +34,7 @@
  * Inode map display utility for XFS.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 int main(int argc, char **argv)
 {

diff --git a/include/Makefile b/include/Makefile
index 839475bf59b0f087a0c061d6a4fe3b2dd3706851..2d00334000f3a154ba36d0dbc1ba5b0866a55f0f 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -48,11 +48,12 @@ LHFILES = xfs_acl.h xfs_cap.h xfs_mac.h
 DKHFILES = volume.h fstyp.h dvh.h
 LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules \
        $(LHFILES) $(DKHFILES)
-LDIRT = xfs
+LDIRT = xfs disk
 
 default install :
-       rm -f xfs
+       rm -f xfs disk
        $(LN_S) . xfs
+       $(LN_S) . disk
 
 include $(BUILDRULES)
 

diff --git a/io/bmap.c b/io/bmap.c
index 6d2671d33ce5b1861b7950a44cd8bcb48a0033cf..d6668377995d1ea5dac09271ec8f1ef495936472 100644 (file)
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/io/command.c b/io/command.c
index 7b798365f3e568c197527b48099fdc449b753a08..f5e60839dbcb6b030f1f231842cb038c10463d9b 100644 (file)
--- a/io/command.c
+++ b/io/command.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 cmdinfo_t      *cmdtab;

diff --git a/io/fsync.c b/io/fsync.c
index 2dfd1f77fc510b28fcbb0c32829aa00c89bd96fe..c4d35acc08939d4b0b9dc9c9247ada74d01529ae 100644 (file)
--- a/io/fsync.c
+++ b/io/fsync.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/io/help.c b/io/help.c
index caaa7f1608bc89198f09da2af19a2cd4879c7d5c..692c70536a1b44e0f0e36ea075f7c90f52d3ecad 100644 (file)
--- a/io/help.c
+++ b/io/help.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 static cmdinfo_t help_cmd;

diff --git a/io/init.c b/io/init.c
index 16e6b0f467f3e069d07c9ddfef867924e2d20dc8..076d44bbbd9498edbbb7a1ba0dd4a6af3d303639 100644 (file)
--- a/io/init.c
+++ b/io/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "input.h"
 #include "command.h"
 

diff --git a/io/input.c b/io/input.c
index c6263285bff02487e1a36783ddc61cc6b5e66f69..5a2a2cc06b0cbdd543e8a034bba2d20e12bbc618 100644 (file)
--- a/io/input.c
+++ b/io/input.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "input.h"
 #include "init.h"
 

diff --git a/io/open.c b/io/open.c
index 4997b3a734f373eedda634ca5b035538e33e59e2..49caec41a60e4bbd27b66873b00d6fce8df12883 100644 (file)
--- a/io/open.c
+++ b/io/open.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/io/pread.c b/io/pread.c
index 1859046dee89f8ab33bc7680e2ec1a3d0cf85579..31cd5437a7372e15803908508b3fd2608b304598 100644 (file)
--- a/io/pread.c
+++ b/io/pread.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include "command.h"
 #include "input.h"

diff --git a/io/prealloc.c b/io/prealloc.c
index c9283875276812309faf27c2ef0ade2dbf114e12..c806cefa3c060916cbd0519d34e1ec1d84e8efdb 100644 (file)
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/io/pwrite.c b/io/pwrite.c
index 528ceaa3a8f0c48eca4edcb9948905a4e55f3e81..e1fef4b1b15cf1848f0521eca9e112008c4caf9a 100644 (file)
--- a/io/pwrite.c
+++ b/io/pwrite.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "input.h"
 #include "init.h"

diff --git a/io/quit.c b/io/quit.c
index a72ed944eecb69bdd10e1dc84b2bd25f84f4a5c9..67942b5424cf171593906417b3e9176501666d01 100644 (file)
--- a/io/quit.c
+++ b/io/quit.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 
 static cmdinfo_t quit_cmd;

diff --git a/io/resblks.c b/io/resblks.c
index 5774fc73ae99c7723f55a7e96e9fbed2eb273264..38361787db3f857dc5fffa5a81f69167c366b9e1 100644 (file)
--- a/io/resblks.c
+++ b/io/resblks.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/io/truncate.c b/io/truncate.c
index be420dde797fcdc6e7933ca4f9ddabb60b48aad2..49d54d1e93c309ebc466507d1605919b01b0887d 100644 (file)
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "command.h"
 #include "init.h"
 

diff --git a/libdisk/drivers.h b/libdisk/drivers.h
index ad8634c6e5086ff406cb48ac65bdb26b3ca58b25..cd729cb2e2774e44ecfa3a087b9c9cd916940fe9 100644 (file)
--- a/libdisk/drivers.h
+++ b/libdisk/drivers.h
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include <volume.h>
 

diff --git a/libdisk/evms.c b/libdisk/evms.c
index 3153e7a69ce9befb3295ab20ff340c1d08335360..62f937379b5a474a98e56f71d117d123677b6944 100644 (file)
--- a/libdisk/evms.c
+++ b/libdisk/evms.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
-#include <volume.h>
+#include <disk/volume.h>
 #include "evms.h"
 
 int

diff --git a/libdisk/pttype.c b/libdisk/pttype.c
index 265d6b6cc948e4639a2a21aeb856d1583256e702..f5cf858f5a1d35f61aac86d21edc9a9c14dcd59c 100644 (file)
--- a/libdisk/pttype.c
+++ b/libdisk/pttype.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <dvh.h>
+#include <disk/dvh.h>
 #include "pttype.h"
 
 #define blksize 512

diff --git a/libdisk/xvm.c b/libdisk/xvm.c
index dc4612ff5e78ac1ff9aea1575a9f2626afba0865..05c44a77dc0cf4996222ecea8fd565c866597340 100644 (file)
--- a/libdisk/xvm.c
+++ b/libdisk/xvm.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <volume.h>
+#include <disk/volume.h>
 #include "xvm.h"
 
 int

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 07fb296e875e7f77af8fe0938cebe81c96b23ce9..4433dc76841cef978e2e533343293c61141aed1a 100644 (file)
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -31,12 +31,12 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 /* attributes.h (purposefully) unavailable to xfsprogs, make do */
 struct attrlist_cursor { __u32 opaque[4]; };
 
-#include <handle.h>
+#include <xfs/handle.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 91ea76a8b9e19d796060245eaf7649b16559bb45..c93a3988d8b414c10717563b0753f85ac7fc8d15 100644 (file)
--- a/libhandle/jdm.c
+++ b/libhandle/jdm.c
@@ -31,13 +31,13 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 /* attributes.h (purposefully) unavailable to xfsprogs, make do */
 struct attrlist_cursor { __u32 opaque[4]; };
 
-#include <handle.h>
-#include <jdm.h>
+#include <xfs/handle.h>
+#include <xfs/jdm.h>
 
 /* internal fshandle - typecast to a void for external use */
 #define FSHANDLE_SZ            8

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index 87586b4b032de3c96daa6d11838f62e33b9e2547..d7a8daede6ae98402d5bd55e0c142cadf9a5269b 100644 (file)
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 extern char *progname;
 

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index a9075a079c833cbb7d077d50955113dfa05922ed..b48b48e679c31860f67b6edb5f8154ad2334848e 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -32,7 +32,7 @@
  */
 
 #define ustat __kernel_ustat
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>

diff --git a/libxfs/init.c b/libxfs/init.c
index adc02b5cbb7908aa55092f3747277b49c25f1485..6176948f5ac0a5da30f256886c4074cd0f728024 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include "init.h"
 

diff --git a/libxfs/irix.c b/libxfs/irix.c
index 03af0556a67bfca29b451f49bca69651d8f49296..d6782cc3e616d9fba00407c4f6224b51bf359327 100644 (file)
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 extern char *progname;
 extern __int64_t findsize(char *);

diff --git a/libxfs/linux.c b/libxfs/linux.c
index 38f0da3175e95f5ec42aa638df91f90039760d7b..fd3be4705dd3d097b0d8f3235fe7f1732cd24691 100644 (file)
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -31,7 +31,7 @@
  */
 
 #define ustat __kernel_ustat
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <mntent.h>
 #include <sys/stat.h>
 #undef ustat

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 14ade5de764265f2ad66b1ec1b7ec97d60a360ac..614f10b75954175c64cb375721d6137915cd7406 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -30,9 +30,9 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <xfs_log.h>
-#include <xfs_log_priv.h>
+#include <xfs/libxfs.h>
+#include <xfs/xfs_log.h>
+#include <xfs/xfs_log_priv.h>
 
 #define BBTOOFF64(bbs) (((xfs_off_t)(bbs)) << BBSHIFT)
 #define BDSTRAT_SIZE   (256 * 1024)

diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index 0c0272a18d122d1a2ed45804aad507e47e20e712..52c768e4e964ec18899f5ccd9df0ee84586208c4 100644 (file)
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -56,10 +56,7 @@
  *         specifically there to support the user level build.
  */
 
-#include <libxfs.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
+#include <xfs/libxfs.h>
 
 /*
  * Map XFS kernel routine names to libxfs.h names

diff --git a/libxlog/util.c b/libxlog/util.c
index a00829a0e950f8f30246f078b8ab766aa602fd3a..4aebea634b1b37551dc53214b8646538c23cd48a 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 int print_exit;
 int print_record_header;

diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 0d1f85e34a17327ddc9de4bfe001a47aa805c656..a43a99404cf59e3c07328f1ecc79a1819c283498 100644 (file)
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 /*
  * This routine finds (to an approximation) the first block in the physical

diff --git a/logprint/logprint.h b/logprint/logprint.h
index c141ac569fe91d73e9e430284a66521cde95f0cb..0c971699c5f745e98cd6d7c7b60326afabef740e 100644 (file)
--- a/logprint/logprint.h
+++ b/logprint/logprint.h
@@ -32,7 +32,7 @@
 #ifndef LOGPRINT_H
 #define LOGPRINT_H
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 
 /* command line flags */
 extern int     print_data;

diff --git a/mkfile/xfs_mkfile.c b/mkfile/xfs_mkfile.c
index c536e94c9da84ef6e000032dbad8c92025eeae0c..a2d75897541106b8f6e7d916a4e016811f031507 100644 (file)
--- a/mkfile/xfs_mkfile.c
+++ b/mkfile/xfs_mkfile.c
@@ -34,7 +34,7 @@
  * Make file utility for xfs.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 
 #define        MAXBUFFERSIZE   (256 * 1024)

diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c
index 038cfed5d131a8a348f4ae8e2880db127b47aa90..3354073bef21bff18bb07dc81a395c6445ab4c0e 100644 (file)
--- a/mkfs/fstyp.c
+++ b/mkfs/fstyp.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <fstyp.h>
+#include <xfs/libxfs.h>
+#include <disk/fstyp.h>
 
 /*
  * fstyp allows the user to determine the filesystem identifier of

diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c
index a16c81fcb749e2841f3d95d09531ccbfcf307cbc..db916bf8132111fc0cb65426869565cafe4636ad 100644 (file)
--- a/mkfs/maxtrres.c
+++ b/mkfs/maxtrres.c
@@ -40,7 +40,7 @@
  * and minimum log sizes.
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "xfs_mkfs.h"
 
 xfs_trans_reservations_t tr_count = {

diff --git a/mkfs/proto.c b/mkfs/proto.c
index 773d1a9ef5d66df489ad20a58aea7cb6e794601e..0339e94c59ee838ce7fe870b16bf2e4a40b91fd5 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include <sys/stat.h>
 #include "xfs_mkfs.h"
 

diff --git a/mkfs/trtab.c b/mkfs/trtab.c
index c9395e46ed4165201cd872ace0a69168e4c651d4..746e28cc0f5fc56f6739ace5367d49d68f3f2837 100644 (file)
--- a/mkfs/trtab.c
+++ b/mkfs/trtab.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 #include "xfs_mkfs.h"
 #include "maxtrres.h"
 

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 55b84779f10ce984e72f7dd7941b95d0714073ea..3bdf1d7284d2af9632aa25ac3636c4aafdb04800 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -30,10 +30,9 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <fstyp.h>
-#include <stdio.h>
-#include <volume.h>
-#include <libxfs.h>
+#include <xfs/libxfs.h>
+#include <disk/fstyp.h>
+#include <disk/volume.h>
 #include <ctype.h>
 #include "xfs_mkfs.h"
 

diff --git a/repair/phase2.c b/repair/phase2.c
index 08963eb14c906efea4fbcf891a80b67ab73facfa..84fddd2eec94d75e11c691ac4da7ef5c5c298f12 100644 (file)
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index d36443620f76012a62bb8665957768be36f35ff3..a227c38714ef22c868b12ae78cfffa4ce7ba403e 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxlog.h>
+#include <xfs/libxlog.h>
 #include "avl.h"
 #include "avl64.h"
 #include "globals.h"