libfrog: move path.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 1fd89eb8334d5f99619b4601cf5a6a228b792a11..a53eb924b1915e0b78f5b7b4028764ac5ef9130d 100644 (file)
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -10,7 +10,7 @@
 #include "jdm.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_attr_sf.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index a3fe74ae5df0f510f99d3835359b3d04c0744a7e..eab15984bf28077affbcf693c8494826685775ef 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -5,7 +5,7 @@
  */
 
 #include "libxfs.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/fsgeom.h"
 
 static void

diff --git a/include/Makefile b/include/Makefile
index 2a00dea928ef369c40f3533d5df89398ff1ff1a7..fc90bc4832961b9754df263e184d24f825f2b8bc 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -28,7 +28,6 @@ LIBHFILES = libxfs.h \
        xfs_trans.h \
        command.h \
        input.h \
-       path.h \
        project.h \
        platform_defs.h
 

diff --git a/io/cowextsize.c b/io/cowextsize.c
index 029605afe06133b219b68dd208e789be24343120..da5c6680c7d27f34ce00fb2746b33c8246cc01f3 100644 (file)
--- a/io/cowextsize.c
+++ b/io/cowextsize.c
@@ -14,7 +14,7 @@
 #include "init.h"
 #include "io.h"
 #include "input.h"
-#include "path.h"
+#include "libfrog/paths.h"
 
 static cmdinfo_t cowextsize_cmd;
 static long cowextsize;

diff --git a/io/encrypt.c b/io/encrypt.c
index 8db352592bb9c14a53c2191756c6806a3d545ace..7a0b2465f2c1792fc1b67bfbf4e42633ef7918e8 100644 (file)
--- a/io/encrypt.c
+++ b/io/encrypt.c
@@ -7,7 +7,7 @@
 #include "platform_defs.h"
 #include "command.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "io.h"
 
 #ifndef ARRAY_SIZE

diff --git a/io/fsmap.c b/io/fsmap.c
index e91ffc3684561c6bb0a9e601d99194ad162a95dc..12ec1e442aff025553db03420de6821ececd6470 100644 (file)
--- a/io/fsmap.c
+++ b/io/fsmap.c
@@ -6,7 +6,7 @@
 #include "platform_defs.h"
 #include "command.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "io.h"
 #include "input.h"
 #include "libfrog/fsgeom.h"

diff --git a/io/io.h b/io/io.h
index 0848ab989101c98d52fdb4800f1d5f9b587e0b15..00dff2b700ee6f197211ab618a0b541c48207982 100644 (file)
--- a/io/io.h
+++ b/io/io.h
@@ -5,7 +5,7 @@
  */
 
 #include "xfs.h"
-#include "path.h"
+#include "libfrog/paths.h"
 
 /*
  * Read/write patterns (default is always "forward")

diff --git a/io/label.c b/io/label.c
index 72e07964896d492006a12a0a291f970552ee1b78..890ddde4cbf0ef0a0b9ab4cbde4995eef9ce37c7 100644 (file)
--- a/io/label.c
+++ b/io/label.c
@@ -6,7 +6,7 @@
 #include <sys/ioctl.h>
 #include "platform_defs.h"
 #include "libxfs.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "command.h"
 #include "init.h"
 #include "io.h"

diff --git a/io/parent.c b/io/parent.c
index 18bbf9b8c7d38144f04a31e3d2e44992d3241eba..a78b45884be05412ce90632a082325c3077559a7 100644 (file)
--- a/io/parent.c
+++ b/io/parent.c
@@ -6,7 +6,7 @@
 
 #include "command.h"
 #include "input.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "parent.h"
 #include "handle.h"
 #include "jdm.h"

diff --git a/io/scrub.c b/io/scrub.c
index 052497be5cc62193a88e23b99118c07e801e985f..9d1c62b52027e2b0bb4332575cb9c096dd3d56b7 100644 (file)
--- a/io/scrub.c
+++ b/io/scrub.c
@@ -9,7 +9,7 @@
 #include "command.h"
 #include "input.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "io.h"
 
 static struct cmdinfo scrub_cmd;

diff --git a/libfrog/Makefile b/libfrog/Makefile
index 715589c7a5fde6149bc4c4db95a385639faa231f..f8f7de68c1dc7e91eb6b4767dcdbfcbe4449eb2b 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -37,6 +37,7 @@ crc32cselftest.h \
 crc32defs.h \
 crc32table.h \
 fsgeom.h \
+paths.h \
 ptvar.h \
 radix-tree.h \
 topology.h \

diff --git a/libfrog/paths.c b/libfrog/paths.c
index 6e266654bdc3a3c6979a729b0388d88ba6fbaadb..f0f4548ee42bf367e3fd2e1dfc0ececc3ea47a6a 100644 (file)
--- a/libfrog/paths.c
+++ b/libfrog/paths.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "path.h"
+#include "paths.h"
 #include "input.h"
 #include "project.h"
 #include <limits.h>

diff --git a/include/path.h b/libfrog/paths.h
similarity index 95%
rename from include/path.h
rename to libfrog/paths.h
index 2d6c3c532c421fea8aeabde43bed4e6dea2f0936..c08e37333781a0e050bf3657d5194c75079782cf 100644 (file)
--- a/include/path.h
+++ b/libfrog/paths.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef __PATH_H__
-#define __PATH_H__
+#ifndef __LIBFROG_PATH_H__
+#define __LIBFROG_PATH_H__
 
 #include "platform_defs.h"
 
@@ -58,4 +58,4 @@ typedef struct fs_cursor {
 extern void fs_cursor_initialise(char *__dir, uint __flags, fs_cursor_t *__cp);
 extern fs_path_t *fs_cursor_next_entry(fs_cursor_t *__cp);
 
-#endif /* __PATH_H__ */
+#endif /* __LIBFROG_PATH_H__ */

diff --git a/quota/init.c b/quota/init.c
index 8244e38d19b99b146eb3d2986e4e03609d11d194..9425827591c798825f5d1ea31a1acd80ed1a8d95 100644 (file)
--- a/quota/init.c
+++ b/quota/init.c
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-#include "path.h"
+#include "libfrog/paths.h"
 #include "command.h"
 #include "input.h"
 #include "init.h"

diff --git a/quota/quota.h b/quota/quota.h
index b7f259e8a1c243a8270c3581bed5f10d937fa2e2..5db0a7419711f13dab7535c728ced40d31a473ae 100644 (file)
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -5,7 +5,7 @@
  */
 
 #include "xqm.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "project.h"
 #include <stdbool.h>
 

diff --git a/scrub/common.c b/scrub/common.c
index 1cd2b7ba6d034dcb9dfe261a825f6f2897d21e5a..7db47044515b95cf731defcfd2986e529e49c20f 100644 (file)
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -8,7 +8,7 @@
 #include <sys/statvfs.h>
 #include <syslog.h>
 #include "platform_defs.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "progress.h"

diff --git a/scrub/disk.c b/scrub/disk.c
index dd1095331d235258b2d7b690d79235eb87569581..91e13140bb7a8889e5f18a202f65a29d29353063 100644 (file)
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -18,7 +18,7 @@
 #endif
 #include "platform_defs.h"
 #include "libfrog.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "disk.h"

diff --git a/scrub/filemap.c b/scrub/filemap.c
index dc8f488179fba78d811af18c36c93edc3026cd40..bdc6d8f90165defa1408a00649cdaf2d46d5b8ee 100644 (file)
--- a/scrub/filemap.c
+++ b/scrub/filemap.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/statvfs.h>
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "filemap.h"

diff --git a/scrub/fscounters.c b/scrub/fscounters.c
index 9635c44f5208c6b8e2bba4eebfceebf17eabf17c..8e4b34675a0d25ed05a4dc32df86470d1011453c 100644 (file)
--- a/scrub/fscounters.c
+++ b/scrub/fscounters.c
@@ -10,7 +10,7 @@
 #include "platform_defs.h"
 #include "xfs_arch.h"
 #include "xfs_format.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/inodes.c b/scrub/inodes.c
index 19923de573df259172989122d53fb142cebdaf92..580a845e2fcb783e6fe2515b49eb5f293e8f538a 100644 (file)
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -12,7 +12,7 @@
 #include "xfs_arch.h"
 #include "xfs_format.h"
 #include "handle.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase1.c b/scrub/phase1.c
index d0e77cabe0d496f80745b5b6a50aa8231470a3eb..d123c41999115bd5e4c6b898d4100097b78698ba 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -16,7 +16,7 @@
 #include "libfrog.h"
 #include "libfrog/workqueue.h"
 #include "input.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "handle.h"
 #include "bitops.h"
 #include "libfrog/avl64.h"

diff --git a/scrub/phase2.c b/scrub/phase2.c
index baec11dd9f915da7feeea8c25166bc035a3b770e..f064c83d870c2ae9d0a972f28ed768f25c913e46 100644 (file)
--- a/scrub/phase2.c
+++ b/scrub/phase2.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase3.c b/scrub/phase3.c
index 64a499c3b121d7c17ff7f36b4d88b0913edc5d9c..5eff7907158bd80165fd83e430566d069a8261a7 100644 (file)
--- a/scrub/phase3.c
+++ b/scrub/phase3.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase4.c b/scrub/phase4.c
index 140748358f72268748ba068a8746e6a0b13ce933..589777f61cb3fd1080c800d7e13c7d0af95c5f9f 100644 (file)
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase5.c b/scrub/phase5.c
index ab015821a7e59b9b43f227bd3869c6f4f34c2464..3ff342514737d7865c87fa0d27af0075c5eaf4a5 100644 (file)
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -14,7 +14,7 @@
 #include <linux/fs.h>
 #include "handle.h"
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase6.c b/scrub/phase6.c
index d0e62cea93ce1f4d986f6c2ad6e9cb0acd583691..506e75d2ad87a0b078bc37843c37cc7e37ae1074 100644 (file)
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -8,7 +8,7 @@
 #include <dirent.h>
 #include <sys/statvfs.h>
 #include "handle.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/phase7.c b/scrub/phase7.c
index 8ac1da07a8514ba4c4bc36a1a081763e0595160a..f82b60d6d66b793f16319670d0ad6a6f0859ad46 100644 (file)
--- a/scrub/phase7.c
+++ b/scrub/phase7.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/statvfs.h>
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/ptvar.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/progress.c b/scrub/progress.c
index d0afe90a27e8b7514ab905e3706e261c4e7ccc82..c9a9d28638f33324c011aaf19838b1a30b5fec1a 100644 (file)
--- a/scrub/progress.c
+++ b/scrub/progress.c
@@ -8,7 +8,7 @@
 #include <pthread.h>
 #include <sys/statvfs.h>
 #include <time.h>
-#include "path.h"
+#include "libfrog/paths.h"
 #include "disk.h"
 #include "read_verify.h"
 #include "xfs_scrub.h"

diff --git a/scrub/read_verify.c b/scrub/read_verify.c
index 828f6be64de2e5cc84dbaca6d53ec55f28f13c4c..2152d167992020ae915cd044c19d6ab346741173 100644 (file)
--- a/scrub/read_verify.c
+++ b/scrub/read_verify.c
@@ -9,7 +9,7 @@
 #include <sys/statvfs.h>
 #include "libfrog/ptvar.h"
 #include "libfrog/workqueue.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "counter.h"

diff --git a/scrub/repair.c b/scrub/repair.c
index 45450d8cce6a32b74d2e1dc231e7ef02274d952f..0e5afb200e94bea523d3e1bde62efd50566586b9 100644 (file)
--- a/scrub/repair.c
+++ b/scrub/repair.c
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "scrub.h"

diff --git a/scrub/scrub.c b/scrub/scrub.c
index 136ed5294252d9cdf16aef9259df4f69e22d6a76..ac67f8ec0a6f60c809a05c42affc56bbde105ffb 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "list.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "progress.h"

diff --git a/scrub/spacemap.c b/scrub/spacemap.c
index 774efbaaece0fff28772626a9d0f859c9d506697..a787647887c7d45457c803c9f5919f36a8444640 100644 (file)
--- a/scrub/spacemap.c
+++ b/scrub/spacemap.c
@@ -9,7 +9,7 @@
 #include <pthread.h>
 #include <sys/statvfs.h>
 #include "libfrog/workqueue.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "spacemap.h"

diff --git a/scrub/unicrash.c b/scrub/unicrash.c
index 824b10f0929fc883632138d7f6e3c61f2478463f..17e8f34f49c4e0d957d082adf35b5f5ca1bf9ba7 100644 (file)
--- a/scrub/unicrash.c
+++ b/scrub/unicrash.c
@@ -13,7 +13,7 @@
 #include <unicode/ustring.h>
 #include <unicode/unorm2.h>
 #include <unicode/uspoof.h>
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "unicrash.h"

diff --git a/scrub/vfs.c b/scrub/vfs.c
index 7d79e7f78bd43ddd25266d33ed09834de52e3a22..b5d54837302aba60e9fff3530334043a6f965633 100644 (file)
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include "handle.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index 71fc274f58e7eddfd2f5465715706bf028342029..05478093f8a9734075273effedb68715376d61a0 100644 (file)
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -12,7 +12,7 @@
 #include <sys/statvfs.h>
 #include "platform_defs.h"
 #include "input.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "unicrash.h"

diff --git a/spaceman/file.c b/spaceman/file.c
index 34e5f00505a1626eeb15c9dd4f3302602eaaaef1..f96a29e53d567b21815429640fe0539dc2c5721b 100644 (file)
--- a/spaceman/file.c
+++ b/spaceman/file.c
@@ -10,7 +10,7 @@
 #include "command.h"
 #include "input.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 #include "libfrog/fsgeom.h"
 

diff --git a/spaceman/freesp.c b/spaceman/freesp.c
index 11d0aafbefa150a56e8904f13fde620b602ff14e..034f234068174e8f2d32c5f6df105877ac062e8b 100644 (file)
--- a/spaceman/freesp.c
+++ b/spaceman/freesp.c
@@ -10,7 +10,7 @@
 #include <linux/fiemap.h>
 #include "command.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 #include "input.h"
 

diff --git a/spaceman/info.c b/spaceman/info.c
index 80442e9a0ac89157d14a96f828557cd1a1351154..f563cf1edde148941d20c471ef4aceaf4d9ce164 100644 (file)
--- a/spaceman/info.c
+++ b/spaceman/info.c
@@ -6,7 +6,7 @@
 #include "libxfs.h"
 #include "command.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 #include "libfrog/fsgeom.h"
 

diff --git a/spaceman/init.c b/spaceman/init.c
index c845f9205c947fd85896ace3a3761bb875a73343..fa0397abf1481773da6d4a466833d693459b65fa 100644 (file)
--- a/spaceman/init.c
+++ b/spaceman/init.c
@@ -8,7 +8,7 @@
 #include "command.h"
 #include "input.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 
 char   *progname;

diff --git a/spaceman/prealloc.c b/spaceman/prealloc.c
index 85dfc9eea0293f51f14ca9468310467567ce9f1e..b223010c654d70a9cf9b3c818bd6951fc884c795 100644 (file)
--- a/spaceman/prealloc.c
+++ b/spaceman/prealloc.c
@@ -8,7 +8,7 @@
 #include "command.h"
 #include "input.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 
 static cmdinfo_t prealloc_cmd;

diff --git a/spaceman/trim.c b/spaceman/trim.c
index 88c75a57c824847daee1dff6d1a436f153707931..b23e2bf9a407073fff690b7094d57e6b34dd0794 100644 (file)
--- a/spaceman/trim.c
+++ b/spaceman/trim.c
@@ -7,7 +7,7 @@
 #include "libxfs.h"
 #include "command.h"
 #include "init.h"
-#include "path.h"
+#include "libfrog/paths.h"
 #include "space.h"
 #include "input.h"