gfs2-utils: RHEL7 - libgfs2: Make find_good_lh and jhead_scan static

Andrew Price andyp at fedoraproject.org
Tue Apr 7 21:23:10 UTC 2015


Gitweb:        http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=716ff3208ab771a6f722d034b07e6ff380449dc9
Commit:        716ff3208ab771a6f722d034b07e6ff380449dc9
Parent:        e6340a86067173634df071ed35539b19b46408ef
Author:        Andrew Price <anprice at redhat.com>
AuthorDate:    Tue Sep 30 12:19:06 2014 +0100
Committer:     Andrew Price <anprice at redhat.com>
CommitterDate: Wed Apr 1 16:51:34 2015 +0100

libgfs2: Make find_good_lh and jhead_scan static

These functions were only being using by libgfs2 so remove them from
libgfs2.h and make them static.

Signed-off-by: Andrew Price <anprice at redhat.com>
---
 gfs2/libgfs2/libgfs2.h  |    3 ---
 gfs2/libgfs2/recovery.c |    6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 45ec8b1..2907e8c 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -690,9 +690,6 @@ extern int gfs2_revoke_check(struct gfs2_sbd *sdp, uint64_t blkno,
 extern void gfs2_revoke_clean(struct gfs2_sbd *sdp);
 extern int get_log_header(struct gfs2_inode *ip, unsigned int blk,
 			  struct gfs2_log_header *head);
-extern int find_good_lh(struct gfs2_inode *ip, unsigned int *blk,
-			struct gfs2_log_header *head);
-extern int jhead_scan(struct gfs2_inode *ip, struct gfs2_log_header *head);
 extern int gfs2_find_jhead(struct gfs2_inode *ip, struct gfs2_log_header *head);
 extern int clean_journal(struct gfs2_inode *ip, struct gfs2_log_header *head);
 
diff --git a/gfs2/libgfs2/recovery.c b/gfs2/libgfs2/recovery.c
index 6ea828d..cad723f 100644
--- a/gfs2/libgfs2/recovery.c
+++ b/gfs2/libgfs2/recovery.c
@@ -91,9 +91,7 @@ int get_log_header(struct gfs2_inode *ip, unsigned int blk,
  *
  * Returns: errno
  */
-
-int find_good_lh(struct gfs2_inode *ip, unsigned int *blk,
-		 struct gfs2_log_header *head)
+static int find_good_lh(struct gfs2_inode *ip, unsigned int *blk, struct gfs2_log_header *head)
 {
 	unsigned int orig_blk = *blk;
 	int error;
@@ -123,7 +121,7 @@ int find_good_lh(struct gfs2_inode *ip, unsigned int *blk,
  * Returns: errno
  */
 
-int jhead_scan(struct gfs2_inode *ip, struct gfs2_log_header *head)
+static int jhead_scan(struct gfs2_inode *ip, struct gfs2_log_header *head)
 {
 	unsigned int blk = head->lh_blkno;
 	uint32_t jd_blocks = ip->i_di.di_size / ip->i_sbd->sd_sb.sb_bsize;


More information about the cluster-commits mailing list