xfsprogs: misc static function warning fixes

The last handful of static symbol warning cleanups for misc remaining
issues.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/init.h b/libxfs/init.h
index 2cda8950e5d76d2d1c6874d0a671dd2b96bd68ec..b23e493c8ddccdbc3106983b1f8a3639d4c474d3 100644 (file)
--- a/libxfs/init.h
+++ b/libxfs/init.h
@@ -7,6 +7,7 @@
 #define LIBXFS_INIT_H
 
 struct stat;
+extern int     use_xfs_buf_lock;
 
 extern int platform_check_ismounted (char *path, char *block,
                                        struct stat *sptr, int verbose);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index e580aba1d7eea8ed12913dc6d7cc5b3ec6af2aac..a00360e703a6a6e15816c5f08e134cfca4780694 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -712,8 +712,6 @@ struct list_head    lock_buf_list = {&lock_buf_list, &lock_buf_list};
 int                    lock_buf_count = 0;
 #endif
 
-extern int     use_xfs_buf_lock;
-
 static struct xfs_buf *
 __cache_lookup(struct xfs_bufkey *key, unsigned int flags)
 {

diff --git a/repair/phase2.c b/repair/phase2.c
index b92ceb80575b9ca41684b2027c517ba626d4d116..4bd6c631a0298684c71486364ade11b8960ffc3e 100644 (file)
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -15,8 +15,6 @@
 #include "progress.h"
 #include "scan.h"
 
-void   set_mp(xfs_mount_t *mpp);
-
 /* workaround craziness in the xlog routines */
 int xlog_recover_do_trans(struct xlog *log, xlog_recover_t *t, int p)
 {

diff --git a/repair/scan.h b/repair/scan.h
index aa7c38d8b16343822b5482cfedcd5aa87a7d4609..bf1ee83ec9f1d4a3c5e48496f1f03ef808fd0e0a 100644 (file)
--- a/repair/scan.h
+++ b/repair/scan.h
@@ -8,6 +8,8 @@
 
 struct blkmap;
 
+void set_mp(xfs_mount_t *mpp);
+
 int scan_lbtree(
        xfs_fsblock_t   root,
        int             nlevels,

diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index 8b80c79b0a45e80811286937349b5f5d6d0aab01..a961d8fd262e0788c7c07820373f553941a02c6c 100644 (file)
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -6,6 +6,8 @@
 #ifndef XFS_SCRUB_XFS_SCRUB_H_
 #define XFS_SCRUB_XFS_SCRUB_H_
 
+extern char *progname;
+
 #define _PATH_PROC_MOUNTS      "/proc/mounts"
 
 extern unsigned int            nr_threads;