[01/12] libxfs: move topology declarations into separate header

Commit Message

Darrick J. Wong Sept. 4, 2019, 4:35 a.m. UTC

From: Darrick J. Wong <[e-mail]>

The topology functions live in libfrog now, which means their
declarations don't belong in libxcmd.h.  Create new header file for
them.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 include/libxcmd.h  |   31 -------------------------------
 libfrog/Makefile   |    3 ++-
 libfrog/topology.c |    1 +
 libfrog/topology.h |   39 +++++++++++++++++++++++++++++++++++++++
 mkfs/xfs_mkfs.c    |    2 +-
 repair/sb.c        |    1 +
 6 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 libfrog/topology.h

Comments

Dave Chinner Sept. 4, 2019, 11:24 p.m. UTC | #1

On Tue, Sep 03, 2019 at 09:35:50PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <[e-mail]>
> 
> The topology functions live in libfrog now, which means their
> declarations don't belong in libxcmd.h.  Create new header file for
> them.
> 
> Signed-off-by: Darrick J. Wong <[e-mail]>
> ---
>  include/libxcmd.h  |   31 -------------------------------
>  libfrog/Makefile   |    3 ++-
>  libfrog/topology.c |    1 +
>  libfrog/topology.h |   39 +++++++++++++++++++++++++++++++++++++++
>  mkfs/xfs_mkfs.c    |    2 +-
>  repair/sb.c        |    1 +
>  6 files changed, 44 insertions(+), 33 deletions(-)
>  create mode 100644 libfrog/topology.h

*nod*

Reviewed-by: Dave Chinner <[e-mail]>

Patch

diff --git a/include/libxcmd.h b/include/libxcmd.h
index 20e5d834..7b889b0a 100644
--- a/include/libxcmd.h
+++ b/include/libxcmd.h
@@ -10,35 +10,4 @@ 
 #include "libxfs.h"
 #include <sys/time.h>
 
-/*
- * Device topology information.
- */
-typedef struct fs_topology {
-	int	dsunit;		/* stripe unit - data subvolume */
-	int	dswidth;	/* stripe width - data subvolume */
-	int	rtswidth;	/* stripe width - rt subvolume */
-	int	lsectorsize;	/* logical sector size &*/
-	int	psectorsize;	/* physical sector size */
-} fs_topology_t;
-
-extern void
-get_topology(
-	libxfs_init_t		*xi,
-	struct fs_topology	*ft,
-	int			force_overwrite);
-
-extern void
-calc_default_ag_geometry(
-	int		blocklog,
-	uint64_t	dblocks,
-	int		multidisk,
-	uint64_t	*agsize,
-	uint64_t	*agcount);
-
-extern int
-check_overwrite(
-	const char	*device);
-
-
-
 #endif	/* __LIBXCMD_H__ */
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 4f6a54ab..37976029 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -30,7 +30,8 @@  workqueue.c
 HFILES = \
 bulkstat.h \
 crc32defs.h \
-crc32table.h
+crc32table.h \
+topology.h
 
 LSRCFILES += gen_crc32table.c
 
diff --git a/libfrog/topology.c b/libfrog/topology.c
index cac164f3..e2f87415 100644
--- a/libfrog/topology.c
+++ b/libfrog/topology.c
@@ -10,6 +10,7 @@ 
 #  include <blkid/blkid.h>
 #endif /* ENABLE_BLKID */
 #include "xfs_multidisk.h"
+#include "topology.h"
 
 #define TERABYTES(count, blog)	((uint64_t)(count) << (40 - (blog)))
 #define GIGABYTES(count, blog)	((uint64_t)(count) << (30 - (blog)))
diff --git a/libfrog/topology.h b/libfrog/topology.h
new file mode 100644
index 00000000..6fde868a
--- /dev/null
+++ b/libfrog/topology.h
@@ -0,0 +1,39 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ */
+
+#ifndef __LIBFROG_TOPOLOGY_H__
+#define __LIBFROG_TOPOLOGY_H__
+
+/*
+ * Device topology information.
+ */
+typedef struct fs_topology {
+	int	dsunit;		/* stripe unit - data subvolume */
+	int	dswidth;	/* stripe width - data subvolume */
+	int	rtswidth;	/* stripe width - rt subvolume */
+	int	lsectorsize;	/* logical sector size &*/
+	int	psectorsize;	/* physical sector size */
+} fs_topology_t;
+
+extern void
+get_topology(
+	libxfs_init_t		*xi,
+	struct fs_topology	*ft,
+	int			force_overwrite);
+
+extern void
+calc_default_ag_geometry(
+	int		blocklog,
+	uint64_t	dblocks,
+	int		multidisk,
+	uint64_t	*agsize,
+	uint64_t	*agcount);
+
+extern int
+check_overwrite(
+	const char	*device);
+
+#endif	/* __LIBFROG_TOPOLOGY_H__ */
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 0bdf6ec3..fd6823c5 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -9,7 +9,7 @@ 
 #include "xfs_multidisk.h"
 #include "libxcmd.h"
 #include "fsgeom.h"
-
+#include "libfrog/topology.h"
 
 #define TERABYTES(count, blog)	((uint64_t)(count) << (40 - (blog)))
 #define GIGABYTES(count, blog)	((uint64_t)(count) << (30 - (blog)))
diff --git a/repair/sb.c b/repair/sb.c
index 119bf219..3955dfba 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -12,6 +12,7 @@ 
 #include "protos.h"
 #include "err_protos.h"
 #include "xfs_multidisk.h"
+#include "libfrog/topology.h"
 
 #define BSIZE	(1024 * 1024)