From fee684909c258ca73516abd99d1f97aed9f590f7 Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <darrick.wong@oracle.com>
Date: Mon, 9 Sep 2019 15:37:06 -0400
Subject: [PATCH] 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>
---
 db/info.c                     | 2 +-
 fsr/xfs_fsr.c                 | 2 +-
 growfs/xfs_growfs.c           | 2 +-
 io/bmap.c                     | 2 +-
 io/fsmap.c                    | 2 +-
 io/imap.c                     | 2 +-
 io/open.c                     | 2 +-
 io/stat.c                     | 2 +-
 io/swapext.c                  | 2 +-
 libfrog/Makefile              | 1 +
 {include => libfrog}/fsgeom.h | 6 +++---
 mkfs/xfs_mkfs.c               | 2 +-
 quota/free.c                  | 2 +-
 quota/quot.c                  | 2 +-
 repair/xfs_repair.c           | 2 +-
 rtcp/xfs_rtcp.c               | 2 +-
 scrub/inodes.c                | 2 +-
 scrub/phase1.c                | 2 +-
 scrub/xfs_scrub.h             | 2 +-
 spaceman/file.c               | 2 +-
 spaceman/info.c               | 2 +-
 21 files changed, 23 insertions(+), 22 deletions(-)
 rename {include => libfrog}/fsgeom.h (96%)

diff --git a/db/info.c b/db/info.c
index 7dae6e255..e5f1c2dd7 100644
--- 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 64892dd5e..1fd89eb83 100644
--- 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 4d48617ad..a3fe74ae5 100644
--- 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 d4262cf2b..cf4ea12b7 100644
--- 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 67baa8178..e91ffc368 100644
--- 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 86d8bda38..472c1fda3 100644
--- 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 169f375c5..99ca0dd39 100644
--- 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 4c1cc83dd..6c666146e 100644
--- 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 d805ffbb1..2b4918f85 100644
--- 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 5ba32a221..98f2feb58 100644
--- 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 1c397cb67..6993dafb3 100644
--- 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 fd6823c5b..50913866b 100644
--- 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 a8b6bd1f0..73aeb4591 100644
--- 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 b718b09d7..686b2726f 100644
--- 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 d7e70dd0c..b11b7448a 100644
--- 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 f6ef0e6c6..a57376993 100644
--- 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 bf98f6eef..faffef543 100644
--- 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 6d1cbe25c..23df9a150 100644
--- 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 6178f324b..f9a72052d 100644
--- 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 72ef27f3c..34e5f0050 100644
--- 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 151594a8b..80442e9a0 100644
--- 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)
-- 
2.47.3