[gfs2-utils] 35/40: Fix sparse warnings about linkage

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch andyp-sparse
in repository gfs2-utils.

commit 237382490463f94c17763c0804d3992b27ff1e5a
Author: Andrew Price <anprice(a)redhat.com&gt;
AuthorDate: Fri Jun 11 13:57:22 2021 +0100

    Fix sparse warnings about linkage
    
    Fixes a bajillion cases of "warning: symbol '<symbol>' was not
declared.
    Should it be static?"
    
    Signed-off-by: Andrew Price <anprice(a)redhat.com&gt;
---
 gfs2/convert/gfs2_convert.c | 37 +++++++++++++++--------------
 gfs2/edit/extended.c        |  2 --
 gfs2/edit/gfs2hex.c         |  4 ++--
 gfs2/edit/gfs2hex.h         |  1 +
 gfs2/edit/hexedit.c         | 16 ++++---------
 gfs2/edit/hexedit.h         |  1 +
 gfs2/edit/journal.c         |  2 --
 gfs2/edit/savemeta.c        |  9 ++++---
 gfs2/fsck/fs_recovery.c     | 16 +++++++------
 gfs2/fsck/fsck.h            |  1 +
 gfs2/fsck/initialize.c      |  1 -
 gfs2/fsck/main.c            | 13 ++++++-----
 gfs2/fsck/pass1.c           | 18 +++++++-------
 gfs2/fsck/pass2.c           | 12 +++++-----
 gfs2/fsck/pass4.c           |  2 +-
 gfs2/fsck/rgrepair.c        |  4 ++--
 gfs2/glocktop/glocktop.c    | 57 ++++++++++++++++++++++-----------------------
 gfs2/mkfs/main_mkfs.c       |  2 +-
 gfs2/tune/main.c            |  5 ++--
 tests/nukerg.c              |  2 +-
 20 files changed, 99 insertions(+), 106 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 5228c532..fdcdce54 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -94,24 +94,25 @@ struct gfs2_options {
 	unsigned int query:1;
 };
 
-struct gfs_sb gfs1_sb;
-struct gfs2_sbd sb2;
-struct inode_block dirs_to_fix;  /* linked list of directories to fix */
-struct inode_dir_block cdpns_to_fix; /* linked list of cdpn symlinks */
-int seconds;
-struct timeval tv;
-uint64_t dirs_fixed;
-uint64_t cdpns_fixed;
-uint64_t dirents_fixed;
-struct gfs_jindex *sd_jindex = NULL;    /* gfs1 journal index in memory */
-int gfs2_inptrs;
-uint64_t gfs2_heightsize[GFS2_MAX_META_HEIGHT];
-uint64_t gfs2_jheightsize[GFS2_MAX_META_HEIGHT];
-uint32_t gfs2_max_height;
-uint32_t gfs2_max_jheight;
-uint64_t jindex_addr = 0, rindex_addr = 0;
+static struct gfs_sb gfs1_sb;
+static struct gfs2_sbd sb2;
+static struct inode_block dirs_to_fix;  /* linked list of directories to fix */
+static struct inode_dir_block cdpns_to_fix; /* linked list of cdpn symlinks */
+static int seconds;
+static struct timeval tv;
+static uint64_t dirs_fixed;
+static uint64_t cdpns_fixed;
+static uint64_t dirents_fixed;
+static struct gfs_jindex *sd_jindex = NULL;    /* gfs1 journal index in memory */
+static int gfs2_inptrs;
+static uint64_t gfs2_heightsize[GFS2_MAX_META_HEIGHT];
+static uint64_t gfs2_jheightsize[GFS2_MAX_META_HEIGHT];
+static uint32_t gfs2_max_height;
+static uint32_t gfs2_max_jheight;
+static uint64_t jindex_addr = 0, rindex_addr = 0;
+static unsigned orig_journals = 0;
+
 int print_level = MSG_NOTICE;
-unsigned orig_journals = 0;
 
 /* ------------------------------------------------------------------------- */
 /* This function is for libgfs's sake.                                       */
@@ -773,7 +774,7 @@ out:
 	return error;
 }
 
-const char *cdpn[14] = {"{hostname}", "{mach}", "{os}",
"{uid}", "{gid}", "{sys}", "{jid}",
+static const char *cdpn[14] = {"{hostname}", "{mach}",
"{os}", "{uid}", "{gid}", "{sys}",
"{jid}",
 			"@hostname", "@mach", "@os", "@uid",
"@gid", "@sys", "@jid"};
 static int has_cdpn(const char *str)
 {
diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c
index 92dbb415..d6e4624a 100644
--- a/gfs2/edit/extended.c
+++ b/gfs2/edit/extended.c
@@ -25,8 +25,6 @@
 #include "extended.h"
 #include "gfs2hex.h"
 
-extern uint64_t block;
-
 static void print_block_details(struct iinfo *ind, int level, int cur_height,
 				int pndx, uint64_t file_offset);
 
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index d1878639..95572fef 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -28,7 +28,7 @@
 	} while(0)
 
 struct gfs2_dinode *di;
-int line, termlines, modelines[DMODES];
+int line, termlines;
 char edit_fmt[80];
 char estring[1024];
 char efield[64];
@@ -63,7 +63,7 @@ const char *termtype;
 WINDOW *wind;
 int dsplines = 0;
 
-const char *block_type_str[15] = {
+static const char *block_type_str[15] = {
 	"Clump",
 	"Superblock",
 	"Resource Group Header",
diff --git a/gfs2/edit/gfs2hex.h b/gfs2/edit/gfs2hex.h
index a86e3a4c..14230ffa 100644
--- a/gfs2/edit/gfs2hex.h
+++ b/gfs2/edit/gfs2hex.h
@@ -9,5 +9,6 @@ extern void do_dinode_extended(char *buf);
 extern void print_gfs2(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 extern uint64_t do_leaf_extended(char *dlebuf, struct iinfo *indir);
 extern void eol(int col);
+extern uint64_t block;
 
 #endif /*  __GFS2HEX_DOT_H__  */
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 00f5aa03..fd7388ce 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -36,19 +36,13 @@ const char *allocdesc[2][5] = {
 	{"Free ", "Data ", "Unlnk", "Meta ",
"Resrv"},
 	{"Free ", "Data ", "FreeM", "Meta ",
"Resrv"},};
 
-struct gfs2_buffer_head *bh;
-struct gfs2_rgrp *lrgrp;
-struct gfs2_meta_header *lmh;
-struct gfs2_dinode *ldi;
-struct gfs2_leaf *lleaf;
-struct gfs2_log_header *llh;
-struct gfs2_log_descriptor *lld;
-int pgnum;
-int details = 0;
-long int gziplevel = 9;
+static struct gfs2_buffer_head *bh;
+static int pgnum;
+static long int gziplevel = 9;
 static int termcols;
+
+int details = 0;
 char *device = NULL;
-extern uint64_t block;
 
 /* ------------------------------------------------------------------------- */
 /* erase - clear the screen */
diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h
index adbeb742..e48c5885 100644
--- a/gfs2/edit/hexedit.h
+++ b/gfs2/edit/hexedit.h
@@ -62,6 +62,7 @@ extern int dsp_lines[DMODES];
 extern int combined_display;
 extern int details;
 extern const char *allocdesc[2][5];
+extern char *device;
 
 struct idirent {
 	struct lgfs2_inum inum;
diff --git a/gfs2/edit/journal.c b/gfs2/edit/journal.c
index 1baba02f..d7710c2b 100644
--- a/gfs2/edit/journal.c
+++ b/gfs2/edit/journal.c
@@ -26,8 +26,6 @@
 #include "gfs2hex.h"
 #include "journal.h"
 
-extern uint64_t block;
-
 /**
  * find_journal_block - figure out where a journal starts, given the name
  * Returns: journal block number, changes j_size to the journal size
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index a99930c2..473a2d03 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -60,9 +60,9 @@ struct metafd {
 	const char* (*strerr)(struct metafd *mfd);
 };
 
-char *restore_buf;
-ssize_t restore_left;
-off_t restore_off;
+static char *restore_buf;
+static ssize_t restore_left;
+static off_t restore_off;
 #define RESTORE_BUF_SIZE (2 * 1024 * 1024)
 
 static char *restore_buf_next(struct metafd *mfd, size_t required_len)
@@ -184,7 +184,6 @@ static uint64_t journal_blocks[MAX_JOURNALS_SAVED];
 static uint64_t gfs1_journal_size = 0; /* in blocks */
 static int journals_found = 0;
 int print_level = MSG_NOTICE;
-extern char *device;
 
 static int block_is_a_journal(uint64_t blk)
 {
@@ -196,7 +195,7 @@ static int block_is_a_journal(uint64_t blk)
 	return FALSE;
 }
 
-struct osi_root per_node_tree;
+static struct osi_root per_node_tree;
 struct per_node_node {
 	struct osi_node node;
 	uint64_t block;
diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index c15c2dc2..6903e8a6 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -19,11 +19,13 @@
 #define JOURNAL_NAME_SIZE 18
 #define JOURNAL_SEQ_TOLERANCE 10
 
-unsigned int sd_found_jblocks = 0, sd_replayed_jblocks = 0;
-unsigned int sd_found_metablocks = 0, sd_replayed_metablocks = 0;
-unsigned int sd_found_revokes = 0;
-osi_list_t sd_revoke_list;
-unsigned int sd_replay_tail;
+static unsigned int sd_found_jblocks = 0;
+static unsigned int sd_replayed_jblocks = 0;
+static unsigned int sd_found_metablocks = 0;
+static unsigned int sd_replayed_metablocks = 0;
+static unsigned int sd_found_revokes = 0;
+static osi_list_t sd_revoke_list;
+static unsigned int sd_replay_tail;
 
 struct gfs2_revoke_replay {
 	osi_list_t rr_list;
@@ -666,7 +668,7 @@ static int rangecheck_jdata(struct gfs2_inode *ip, uint64_t
metablock,
 	return rangecheck_jblock(ip, block);
 }
 
-struct metawalk_fxns rangecheck_journal = {
+static struct metawalk_fxns rangecheck_journal = {
 	.private = NULL,
 	.invalid_meta_is_fatal = 1,
 	.check_metalist = rangecheck_jmeta,
@@ -854,7 +856,7 @@ dirent_good:
 	return 0;
 }
 
-struct metawalk_fxns jindex_check_fxns = {
+static struct metawalk_fxns jindex_check_fxns = {
 	.private = NULL,
 	.check_dentry = check_jindex_dent,
 };
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index 55f5abe8..91ef23d1 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -199,5 +199,6 @@ struct special_blocks {
 extern struct special_blocks *blockfind(struct special_blocks *blist, uint64_t num);
 extern void gfs2_special_set(struct special_blocks *blocklist, uint64_t block);
 extern void gfs2_special_free(struct special_blocks *blist);
+extern int sb_fixed;
 
 #endif /* _FSCK_H */
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 039a0fd7..4bc7eef6 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -34,7 +34,6 @@ static int was_mounted_ro = 0;
 static uint64_t possible_root = HIGHEST_BLOCK;
 static struct master_dir fix_md;
 static unsigned long long blks_2free = 0;
-extern int sb_fixed;
 
 /**
  * block_mounters
diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index a7ea9bf2..b528b5ee 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -32,18 +32,19 @@ uint64_t last_fs_block, last_reported_block = -1;
 int64_t last_reported_fblock = -1000000;
 int skip_this_pass = 0, fsck_abort = 0;
 int errors_found = 0, errors_corrected = 0;
-const char *pass = "";
 uint64_t last_data_block;
 uint64_t first_data_block;
-int preen = 0, force_check = 0;
 struct osi_root dup_blocks;
 struct osi_root dirtree;
 struct osi_root inodetree;
 int dups_found = 0, dups_found_first = 0;
-struct gfs_sb *sbd1 = NULL;
 int sb_fixed = 0;
 int print_level = MSG_NOTICE;
 
+static int preen = 0;
+static int force_check = 0;
+static const char *pass_name = "";
+
 /* This function is for libgfs2's sake.                                      */
 void print_it(const char *label, const char *fmt, const char *fmt2, ...)
 {
@@ -148,8 +149,8 @@ static void interrupt(int sig)
 		sprintf(progress, _("processing block %llu out of %llu\n"),
 			(unsigned long long)last_reported_block,
 			(unsigned long long)last_fs_block);
-	
-	response = generic_interrupt("fsck.gfs2", pass, progress,
+
+	response = generic_interrupt("fsck.gfs2", pass_name, progress,
 				     _("Do you want to abort fsck.gfs2, skip " \
 				     "the rest of this pass or continue " \
 				     "(a/s/c)?"), "asc");
@@ -253,7 +254,7 @@ static int fsck_pass(const struct fsck_pass *p, struct gfs2_sbd *sdp)
 
 	if (fsck_abort)
 		return FSCK_CANCELED;
-	pass = p->name;
+	pass_name = p->name;
 
 	log_notice( _("Starting %s\n"), p->name);
 	gettimeofday(&timer, NULL);
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 8a8ce97c..d619a972 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -29,8 +29,8 @@
 #include "metawalk.h"
 #include "fs_recovery.h"
 
-struct special_blocks gfs1_rindex_blks;
-struct gfs2_bmap *bl = NULL;
+static struct special_blocks gfs1_rindex_blks;
+static struct gfs2_bmap *bl = NULL;
 
 struct block_count {
 	uint64_t indir_count;
@@ -164,7 +164,7 @@ out:
 	return 0;
 }
 
-struct metawalk_fxns pass1_fxns = {
+static struct metawalk_fxns pass1_fxns = {
 	.private = NULL,
 	.check_leaf = p1check_leaf,
 	.check_metalist = pass1_check_metalist,
@@ -265,7 +265,7 @@ static int resuscitate_dentry(struct gfs2_inode *ip, struct
gfs2_dirent *dent,
 	return 0;
 }
 
-struct metawalk_fxns sysdir_fxns = {
+static struct metawalk_fxns sysdir_fxns = {
 	.private = NULL,
 	.check_metalist = resuscitate_metalist,
 	.check_dentry = resuscitate_dentry,
@@ -1088,7 +1088,7 @@ static int invalidate_eattr_leaf(struct gfs2_inode *ip, uint64_t
block,
 				  NULL, NULL);
 }
 
-struct metawalk_fxns invalidate_fxns = {
+static struct metawalk_fxns invalidate_fxns = {
 	.private = NULL,
 	.check_metalist = invalidate_metadata,
 	.check_data = invalidate_data,
@@ -1111,7 +1111,7 @@ struct metawalk_fxns invalidate_fxns = {
  * Returns: 0 if good range, otherwise != 0
  */
 enum b_types { BTYPE_META, BTYPE_LEAF, BTYPE_DATA, BTYPE_IEATTR, BTYPE_EATTR};
-const char *btypes[5] = {
+static const char *btypes[5] = {
 	"metadata", "leaf", "data", "indirect extended
attribute",
 	"extended attribute" };
 
@@ -1189,7 +1189,7 @@ static int rangecheck_eattr_leaf(struct gfs2_inode *ip, uint64_t
block,
 	return rangecheck_block(ip, block, NULL, BTYPE_EATTR, private);
 }
 
-struct metawalk_fxns rangecheck_fxns = {
+static struct metawalk_fxns rangecheck_fxns = {
         .private = NULL,
 	.readahead = 1,
         .check_metalist = rangecheck_metadata,
@@ -1200,7 +1200,7 @@ struct metawalk_fxns rangecheck_fxns = {
 	.delete_block = delete_block,
 };
 
-struct metawalk_fxns eattr_undo_fxns = {
+static struct metawalk_fxns eattr_undo_fxns = {
 	.private = NULL,
 	.check_eattr_indir = undo_eattr_indir_or_leaf,
 	.check_eattr_leaf = undo_eattr_indir_or_leaf,
@@ -1319,7 +1319,7 @@ static int alloc_leaf(struct gfs2_inode *ip, uint64_t block, void
*private)
 	return 0;
 }
 
-struct metawalk_fxns alloc_fxns = {
+static struct metawalk_fxns alloc_fxns = {
 	.private = NULL,
 	.check_leaf = alloc_leaf,
 	.check_metalist = alloc_metalist,
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
index 566fc93d..f547540c 100644
--- a/gfs2/fsck/pass2.c
+++ b/gfs2/fsck/pass2.c
@@ -21,9 +21,9 @@
 
 #define MAX_FILENAME 256
 
-struct metawalk_fxns pass2_fxns;
+static struct metawalk_fxns pass2_fxns;
 
-struct metawalk_fxns delete_eattrs = {
+static struct metawalk_fxns delete_eattrs = {
 	.check_eattr_indir = delete_eattr_indir,
 	.check_eattr_leaf = delete_eattr_leaf,
 	.check_eattr_entry = delete_eattr_entry,
@@ -144,7 +144,7 @@ static int check_file_type(uint64_t block, uint8_t de_type, int q,
 	return *isdir;
 }
 
-struct metawalk_fxns pass2_fxns_delete = {
+static struct metawalk_fxns pass2_fxns_delete = {
 	.private = NULL,
 	.check_metalist = delete_metadata,
 	.check_data = delete_data,
@@ -1262,7 +1262,7 @@ out:
  * We don't want it to do the "wrong leaf" thing, or set_parent_dir
either.
  * We just want a basic sanity check on pointers and lengths.
  */
-struct metawalk_fxns leafck_fxns = {
+static struct metawalk_fxns leafck_fxns = {
 	.check_leaf_depth = check_leaf_depth,
 	.check_dentry = basic_check_dentry,
 	.repair_leaf = pass2_repair_leaf,
@@ -1766,7 +1766,7 @@ static int check_hash_tbl(struct gfs2_inode *ip, uint64_t *tbl,
 	return error;
 }
 
-struct metawalk_fxns pass2_fxns = {
+static struct metawalk_fxns pass2_fxns = {
 	.private = NULL,
 	.check_leaf_depth = check_leaf_depth,
 	.check_leaf = NULL,
@@ -1815,7 +1815,7 @@ static int check_data_qc(struct gfs2_inode *ip, uint64_t metablock,
 	return 0;
 }
 
-struct metawalk_fxns quota_change_fxns = {
+static struct metawalk_fxns quota_change_fxns = {
 	.check_metalist = check_metalist_qc,
 	.check_data = check_data_qc,
 };
diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c
index 0891e143..6da95726 100644
--- a/gfs2/fsck/pass4.c
+++ b/gfs2/fsck/pass4.c
@@ -16,7 +16,7 @@
 #include "util.h"
 #include "afterpass1_common.h"
 
-struct metawalk_fxns pass4_fxns_delete = {
+static struct metawalk_fxns pass4_fxns_delete = {
 	.private = NULL,
 	.check_metalist = delete_metadata,
 	.check_data = delete_data,
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index da62cc47..6698b29c 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -16,8 +16,8 @@
 #include "fsck.h"
 #include "fs_recovery.h"
 
-int rindex_modified = 0;
-struct special_blocks false_rgrps;
+static int rindex_modified = 0;
+static struct special_blocks false_rgrps;
 
 #define BAD_RG_PERCENT_TOLERANCE 11
 #define AWAY_FROM_BITMAPS 0x1000
diff --git a/gfs2/glocktop/glocktop.c b/gfs2/glocktop/glocktop.c
index 437ee0ba..20852b27 100644
--- a/gfs2/glocktop/glocktop.c
+++ b/gfs2/glocktop/glocktop.c
@@ -143,14 +143,14 @@ enum summary_types {
 	stypes = 7,
 };
 
-char *debugfs;
-int termcols = 80, termlines = 30, done = 0;
-unsigned glocks = 0;
-const char *termtype;
-WINDOW *wind;
-int bufsize = 4 * 1024 * 1024;
-char *glock[MAX_GLOCKS];
-int iterations = 0, show_reservations = 0, iters_done = 0;
+static char *debugfs;
+static int termcols = 80, termlines = 30, done = 0;
+static unsigned glocks = 0;
+static const char *termtype;
+static WINDOW *wind;
+static int bufsize = 4 * 1024 * 1024;
+static char *glock[MAX_GLOCKS];
+static int iterations = 0, show_reservations = 0, iters_done = 0;
 struct mount_point {
 	struct mount_point *next;
 	char *device;
@@ -158,27 +158,26 @@ struct mount_point {
 	int fd;
 	struct gfs2_sbd sb;
 };
-struct mount_point *mounts;
-char dlmwlines[MAX_LINES][96]; /* waiters lines */
-char dlmglines[MAX_LINES][97]; /* granted lines */
-char contended_filenames[MAX_FILES][PATH_MAX];
-unsigned long long contended_blocks[MAX_FILES];
-int contended_count = 0;
-int line = 0;
-const char *prog_name;
-char dlm_dirtbl_size[32], dlm_rsbtbl_size[32], dlm_lkbtbl_size[32];
-int bsize = 0;
-char print_dlm_grants = 1;
-char *gbuf = NULL; /* glocks buffer */
-char *gpos = NULL;
-char *gnextpos = NULL;
-int gmaxpos = 0;
-
-char *dbuf = NULL; /* dlm locks buffer */
-char *dpos = NULL;
-char *dnextpos = NULL;
-int dmaxpos = 0;
-char hostname[256];
+static struct mount_point *mounts;
+static char dlmwlines[MAX_LINES][96]; /* waiters lines */
+static char dlmglines[MAX_LINES][97]; /* granted lines */
+static char contended_filenames[MAX_FILES][PATH_MAX];
+static unsigned long long contended_blocks[MAX_FILES];
+static int contended_count = 0;
+static int line = 0;
+static const char *prog_name;
+static char dlm_dirtbl_size[32], dlm_rsbtbl_size[32], dlm_lkbtbl_size[32];
+static int bsize = 0;
+static char print_dlm_grants = 1;
+static char *gbuf = NULL; /* glocks buffer */
+static char *gpos = NULL;
+static char *gnextpos = NULL;
+static int gmaxpos = 0;
+static char *dbuf = NULL; /* dlm locks buffer */
+static char *dpos = NULL;
+static char *dnextpos = NULL;
+static int dmaxpos = 0;
+static char hostname[256];
 
 /*
  * init_colors
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index bca7b9d1..da82d462 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -160,7 +160,7 @@ static void opts_init(struct mkfs_opts *opts)
 	opts->format = GFS2_FORMAT_FS;
 }
 
-struct lgfs2_inum *mkfs_journals = NULL;
+static struct lgfs2_inum *mkfs_journals = NULL;
 
 #ifndef BLKDISCARD
 #define BLKDISCARD      _IO(0x12,119)
diff --git a/gfs2/tune/main.c b/gfs2/tune/main.c
index d5998071..fe137803 100644
--- a/gfs2/tune/main.c
+++ b/gfs2/tune/main.c
@@ -16,9 +16,8 @@
 #include <unistd.h>
 #include "tunegfs2.h"
 
-struct tunegfs2 tunegfs2_struct;
-struct tunegfs2 *tfs = &tunegfs2_struct;
-
+static struct tunegfs2 tunegfs2_struct;
+static struct tunegfs2 *tfs = &tunegfs2_struct;
 
 static void parse_mount_options(char *arg)
 {
diff --git a/tests/nukerg.c b/tests/nukerg.c
index 399f7373..74b65abb 100644
--- a/tests/nukerg.c
+++ b/tests/nukerg.c
@@ -10,7 +10,7 @@
 
 #include <libgfs2.h>
 
-const char *prog_name = "nukerg";
+static const char *prog_name = "nukerg";
 
 static void usage(void)
 {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.