[Cluster-devel] [PATCH 16/18] libgfs2: Remove config.[ch]

[Andrew Price <anprice@redhat.com>]

The cfg_debug bits are no longer used.

Signed-off-by: Andrew Price <anprice@redhat.com>
---
 gfs2/libgfs2/Makefile.am       | 2 --
 gfs2/libgfs2/checks.am         | 1 -
 gfs2/libgfs2/config.c          | 9 ---------
 gfs2/libgfs2/config.h          | 6 ------
 gfs2/libgfs2/device_geometry.c | 1 -
 gfs2/libgfs2/libgfs2.h         | 3 ---
 gfs2/libgfs2/structures.c      | 1 -
 gfs2/mkfs/main_jadd.c          | 1 -
 gfs2/mkfs/main_mkfs.c          | 1 -
 9 files changed, 25 deletions(-)
 delete mode 100644 gfs2/libgfs2/config.c
 delete mode 100644 gfs2/libgfs2/config.h

diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
index c3f2425d..123b85b7 100644
--- a/gfs2/libgfs2/Makefile.am
+++ b/gfs2/libgfs2/Makefile.am
@@ -23,7 +23,6 @@ noinst_HEADERS = \
 	libgfs2.h \
 	crc32c.h \
 	lang.h \
-	config.h \
 	rgrp.h
 
 noinst_LTLIBRARIES = libgfs2.la
@@ -40,7 +39,6 @@ libgfs2_la_SOURCES = \
 	buf.c \
 	gfs2_disk_hash.c \
 	ondisk.c \
-	config.c \
 	device_geometry.c \
 	fs_ops.c \
 	recovery.c \
diff --git a/gfs2/libgfs2/checks.am b/gfs2/libgfs2/checks.am
index 18d719ab..d1aa7189 100644
--- a/gfs2/libgfs2/checks.am
+++ b/gfs2/libgfs2/checks.am
@@ -12,7 +12,6 @@ check_libgfs2_SOURCES = \
 	device_geometry.c \
 	fs_ops.c \
 	structures.c \
-	config.c \
 	fs_bits.c \
 	gfs1.c \
 	misc.c \
diff --git a/gfs2/libgfs2/config.c b/gfs2/libgfs2/config.c
deleted file mode 100644
index d2431e43..00000000
--- a/gfs2/libgfs2/config.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "libgfs2.h"
-#include "config.h"
-
-int cfg_debug = 0;
-
-void lgfs2_set_debug(int enable)
-{
-	cfg_debug = enable;
-}
diff --git a/gfs2/libgfs2/config.h b/gfs2/libgfs2/config.h
deleted file mode 100644
index 7c1eb3c3..00000000
--- a/gfs2/libgfs2/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LGFS2_CONFIG_H__
-#define __LGFS2_CONFIG_H__
-
-extern int cfg_debug;
-
-#endif /* __LGFS2_CONFIG_H__ */
diff --git a/gfs2/libgfs2/device_geometry.c b/gfs2/libgfs2/device_geometry.c
index b149d2c0..cb1ed6d5 100644
--- a/gfs2/libgfs2/device_geometry.c
+++ b/gfs2/libgfs2/device_geometry.c
@@ -14,7 +14,6 @@
 #include <linux/fs.h>
 
 #include "libgfs2.h"
-#include "config.h"
 
 #ifndef BLKSSZGET
 #define BLKSSZGET _IO(0x12,104)   /* logical_block_size */
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index fa710a6c..20d8d57e 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -471,9 +471,6 @@ extern uint32_t lgfs2_get_block_type(const char *buf);
 #define bread(bl, num) __bread(bl, num, __LINE__, __FUNCTION__)
 #define breadm(bl, bhs, n, block) __breadm(bl, bhs, n, block, __LINE__, __FUNCTION__)
 
-/* config.c */
-extern void lgfs2_set_debug(int enable);
-
 /* device_geometry.c */
 extern int lgfs2_get_dev_info(int fd, struct lgfs2_dev_info *i);
 extern void fix_device_geometry(struct gfs2_sbd *sdp);
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c
index 9b78ed51..d7b7f4e1 100644
--- a/gfs2/libgfs2/structures.c
+++ b/gfs2/libgfs2/structures.c
@@ -14,7 +14,6 @@
 #include <uuid.h>
 
 #include "libgfs2.h"
-#include "config.h"
 #include "crc32c.h"
 
 int build_master(struct gfs2_sbd *sdp)
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index 2648b980..0a7f1f33 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -158,7 +158,6 @@ static int decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp, struct
 			break;
 		case 'D':
 			opts->debug = 1;
-			lgfs2_set_debug(1);
 			break;
 		case 'h':
 			print_usage(argv[0]);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index ae192bd4..8f8d8f04 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -366,7 +366,6 @@ static int opts_get(int argc, char *argv[], struct mkfs_opts *opts)
 			break;
 		case 'D':
 			opts->debug = 1;
-			lgfs2_set_debug(1);
 			break;
 		case 'h':
 			print_usage(argv[0]);
-- 
2.34.1