libxlog: remove the global libxfs_xinit x structure

There is no need to export a libxfs_xinit with the somewhat unsuitable
name x from libxlog.  Move it into the tools linking against libxlog
that actually need it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/db/init.c b/db/init.c
index 18d9dfdd95ff9000500d9b197da2d97422107e34..eceaf576cfb9eb95c08c75d3c23e5f5a9531d17b 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -27,6 +27,7 @@ static struct xfs_mount       xmount;
 struct xfs_mount       *mp;
 static struct xlog     xlog;
 xfs_agnumber_t         cur_agno = NULLAGNUMBER;
+libxfs_init_t          x;
 
 static void
 usage(void)

diff --git a/include/libxlog.h b/include/libxlog.h
index 57f39e4e82bacb9d9c9d09222db73bca73b7e0f8..3948c0b8d19b1dc12f31d3cfb4bc9be13ec89022 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -68,9 +68,6 @@ extern int    print_exit;
 extern int     print_skip_uuid;
 extern int     print_record_header;
 
-/* libxfs parameters */
-extern libxfs_init_t   x;
-
 void xlog_init(struct xfs_mount *mp, struct xlog *log);
 int xlog_is_dirty(struct xfs_mount *mp, struct xlog *log);
 

diff --git a/libxlog/util.c b/libxlog/util.c
index d1377c2e2b0b31014c950162c36132bd89850e66..6e21f1a895d30a4468fd80178015954d1be19178 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -10,7 +10,6 @@
 int print_exit;
 int print_skip_uuid;
 int print_record_header;
-libxfs_init_t x;
 
 void
 xlog_init(

diff --git a/logprint/logprint.c b/logprint/logprint.c
index bcdb6b359a14b44ba04dd46b067a6228d6939e1d..1a096fa79987a4191cb4038c3be00b4ec4ab1c6f 100644 (file)
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -25,6 +25,7 @@ int   print_overwrite;
 int     print_no_data;
 int     print_no_print;
 static int     print_operation = OP_PRINT;
+static struct libxfs_xinit x;
 
 static void
 usage(void)

diff --git a/repair/globals.h b/repair/globals.h
index b65e4a2d09cf3e107b3aad1b663cd24d9c9482a2..f2952d8b479491a9fe97d25b59ce317c8af6f78f 100644 (file)
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -169,4 +169,6 @@ extern int          thread_count;
 /* If nonzero, simulate failure after this phase. */
 extern int             fail_after_phase;
 
+extern libxfs_init_t   x;
+
 #endif /* _XFS_REPAIR_GLOBAL_H */

diff --git a/repair/init.c b/repair/init.c
index 6d019b393f3299d0975b70c1e47a7c475effe3d1..6e3548b32ef8c9d66fac05f71687122699f71071 100644 (file)
--- a/repair/init.c
+++ b/repair/init.c
@@ -18,6 +18,8 @@
 #include "libfrog/dahashselftest.h"
 #include <sys/resource.h>
 
+struct libxfs_xinit    x;
+
 static void
 ts_create(void)
 {