libfrog: move fsgeom.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/db/info.c b/db/info.c
index 7dae6e255d2a4dd6d7c25b558d253674fd54cf2f..e5f1c2dd7051a6ab5155d7acb5c51f47d296cc60 100644 (file)
--- a/db/info.c
+++ b/db/info.c
@@ -7,7 +7,7 @@
 #include "command.h"
 #include "init.h"
 #include "output.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static void
 info_help(void)

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 64892dd5eca22873fa62ba243b0596cc27eb2adb..1fd89eb8334d5f99619b4601cf5a6a228b792a11 100644 (file)
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -11,7 +11,7 @@
 #include "xfs_bmap_btree.h"
 #include "xfs_attr_sf.h"
 #include "path.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 #include <fcntl.h>

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 4d48617ad3d03452fefeba50c232964c9602f0e0..a3fe74ae5df0f510f99d3835359b3d04c0744a7e 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -6,7 +6,7 @@
 
 #include "libxfs.h"
 #include "path.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static void
 usage(void)

diff --git a/io/bmap.c b/io/bmap.c
index d4262cf2b7388e559c264320e40fdd0d4f515f50..cf4ea12b75a7eadc84cd1ff2c1c4409f8ed8f4ab 100644 (file)
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -9,7 +9,7 @@
 #include "input.h"
 #include "init.h"
 #include "io.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static cmdinfo_t bmap_cmd;
 

diff --git a/io/fsmap.c b/io/fsmap.c
index 67baa81786f041f882ae9178048388b718b7a2f8..e91ffc3684561c6bb0a9e601d99194ad162a95dc 100644 (file)
--- a/io/fsmap.c
+++ b/io/fsmap.c
@@ -9,7 +9,7 @@
 #include "path.h"
 #include "io.h"
 #include "input.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static cmdinfo_t       fsmap_cmd;
 static dev_t           xfs_data_dev;

diff --git a/io/imap.c b/io/imap.c
index 86d8bda38186d05cc40085716ea53ca9018da0b3..472c1fda3f0f0e453b36dce844c3c44d3d6f981f 100644 (file)
--- a/io/imap.c
+++ b/io/imap.c
@@ -8,7 +8,7 @@
 #include "input.h"
 #include "init.h"
 #include "io.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 static cmdinfo_t imap_cmd;

diff --git a/io/open.c b/io/open.c
index 169f375c519c18c6e1583d16a14c3669a01de9af..99ca0dd39f62f9d2cf31a2bb239b8bcc82df5bed 100644 (file)
--- a/io/open.c
+++ b/io/open.c
@@ -9,7 +9,7 @@
 #include "init.h"
 #include "io.h"
 #include "libxfs.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 #ifndef __O_TMPFILE

diff --git a/io/stat.c b/io/stat.c
index 4c1cc83dd1326708d5c4cb251908ce480eb8c1da..6c666146e6b24cb78e44f869c09152f77e3ee2ea 100644 (file)
--- a/io/stat.c
+++ b/io/stat.c
@@ -12,7 +12,7 @@
 #include "io.h"
 #include "statx.h"
 #include "libxfs.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 #include <fcntl.h>
 

diff --git a/io/swapext.c b/io/swapext.c
index d805ffbb15cd4a82394f0baffafb6cbb77461c97..2b4918f85a35ce9790b96130cbeb4e04dc5893e6 100644 (file)
--- a/io/swapext.c
+++ b/io/swapext.c
@@ -8,7 +8,7 @@
 #include "input.h"
 #include "init.h"
 #include "io.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 static cmdinfo_t swapext_cmd;

diff --git a/libfrog/Makefile b/libfrog/Makefile
index 5ba32a221f67a8ba9365c7af28d62f933e8a5b22..98f2feb586b93c811eb9b82ec11f2d4f4ec73b22 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -34,6 +34,7 @@ bitmap.h \
 convert.h \
 crc32defs.h \
 crc32table.h \
+fsgeom.h \
 topology.h
 
 LSRCFILES += gen_crc32table.c

diff --git a/include/fsgeom.h b/libfrog/fsgeom.h
similarity index 96%
rename from include/fsgeom.h
rename to libfrog/fsgeom.h
index 1c397cb67b4a76a48776b3538c8969d932ea2560..6993dafb3521dae805ffe91953e9e5a86fcc42c1 100644 (file)
--- a/include/fsgeom.h
+++ b/libfrog/fsgeom.h
@@ -2,8 +2,8 @@
 /*
  * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
-#ifndef _LIBFROG_FSGEOM_H_
-#define _LIBFROG_FSGEOM_H_
+#ifndef __LIBFROG_FSGEOM_H__
+#define __LIBFROG_FSGEOM_H__
 
 void xfs_report_geom(struct xfs_fsop_geom *geo, const char *mntpoint,
                const char *logname, const char *rtname);
@@ -99,4 +99,4 @@ cvt_b_to_off_fsbt(
        return bytes >> xfd->blocklog;
 }
 
-#endif /* _LIBFROG_FSGEOM_H_ */
+#endif /* __LIBFROG_FSGEOM_H__ */

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index fd6823c5be9b5acb1226282366e0cf6aaca3a400..50913866ba4e27b938535b5d9432fb0caf66974e 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -8,7 +8,7 @@
 #include <ctype.h>
 #include "xfs_multidisk.h"
 #include "libxcmd.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/topology.h"
 
 #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))

diff --git a/quota/free.c b/quota/free.c
index a8b6bd1f0c19e8e0771ed6e35920a075399c56d5..73aeb4591128d80d1bcb36fd8926527f82159150 100644 (file)
--- a/quota/free.c
+++ b/quota/free.c
@@ -8,7 +8,7 @@
 #include "command.h"
 #include "init.h"
 #include "quota.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static cmdinfo_t free_cmd;
 

diff --git a/quota/quot.c b/quota/quot.c
index b718b09d743c73271bb97cca577a6e9a3e1bd68c..686b2726f18a3266367e7c5d56700a3b701faa2b 100644 (file)
--- a/quota/quot.c
+++ b/quota/quot.c
@@ -11,7 +11,7 @@
 #include <grp.h>
 #include "init.h"
 #include "quota.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 typedef struct du {

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index d7e70dd0c79e6a5adf23988aeb6b4c6603d3f206..b11b7448a956e6ae5ec84f633c4cfc0c95cfc149 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -22,7 +22,7 @@
 #include "dinode.h"
 #include "slab.h"
 #include "rmap.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 /*
  * option tables for getsubopt calls

diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c
index f6ef0e6c6f2424a541a6354a8800e8b5243962a5..a5737699303dac3bb1d34934ee077789adb7485f 100644 (file)
--- a/rtcp/xfs_rtcp.c
+++ b/rtcp/xfs_rtcp.c
@@ -5,7 +5,7 @@
  */
 
 #include "libxfs.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 int rtcp(char *, char *, int);
 int xfsrtextsize(char *path);

diff --git a/scrub/inodes.c b/scrub/inodes.c
index bf98f6eefaaf9576b90a4bc665c054b3f1e56a1f..faffef54324796a1da146e2a9be92aa7d40de3ee 100644 (file)
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -17,7 +17,7 @@
 #include "xfs_scrub.h"
 #include "common.h"
 #include "inodes.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 #include "libfrog/bulkstat.h"
 
 /*

diff --git a/scrub/phase1.c b/scrub/phase1.c
index 6d1cbe25c69aca5f0be98a202dab35f2a51a18d6..23df9a1502670beb76b2e0ee8f94e828d043714e 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -26,7 +26,7 @@
 #include "disk.h"
 #include "scrub.h"
 #include "repair.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 /* Phase 1: Find filesystem geometry (and clean up after) */
 

diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index 6178f324bea5f6532d91aa0349c5dbe293755281..f9a72052d3d8630fbed1617e4152dc1c71504822 100644 (file)
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -6,7 +6,7 @@
 #ifndef XFS_SCRUB_XFS_SCRUB_H_
 #define XFS_SCRUB_XFS_SCRUB_H_
 
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 extern char *progname;
 

diff --git a/spaceman/file.c b/spaceman/file.c
index 72ef27f3c22a1082d7655cfa90ee6391307c10a7..34e5f00505a1626eeb15c9dd4f3302602eaaaef1 100644 (file)
--- a/spaceman/file.c
+++ b/spaceman/file.c
@@ -12,7 +12,7 @@
 #include "init.h"
 #include "path.h"
 #include "space.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static cmdinfo_t print_cmd;
 

diff --git a/spaceman/info.c b/spaceman/info.c
index 151594a8b806519628c8dbd891c968e1713fa92d..80442e9a0ac89157d14a96f828557cd1a1351154 100644 (file)
--- a/spaceman/info.c
+++ b/spaceman/info.c
@@ -8,7 +8,7 @@
 #include "init.h"
 #include "path.h"
 #include "space.h"
-#include "fsgeom.h"
+#include "libfrog/fsgeom.h"
 
 static void
 info_help(void)