cluster: STABLE3 - libgfs2: More fixes in bitmap.c and block_list.c

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6834a0bf614b62e2006c0aa4c333954279dfefa8
Commit:        6834a0bf614b62e2006c0aa4c333954279dfefa8
Parent:        bd8d5389aa8c1bd3a9c0d6f3236900f1fb2f0c70
Author:        Steven Whitehouse <swhiteho@redhat.com>
AuthorDate:    Fri Jan 23 13:57:59 2009 +0000
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Jan 23 16:37:31 2009 +0100

libgfs2: More fixes in bitmap.c and block_list.c

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 gfs2/libgfs2/bitmap.c     |    4 ----
 gfs2/libgfs2/block_list.c |    2 +-
 gfs2/libgfs2/libgfs2.h    |    2 --
 3 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/gfs2/libgfs2/bitmap.c b/gfs2/libgfs2/bitmap.c
index 79b6eee..85c6f95 100644
--- a/gfs2/libgfs2/bitmap.c
+++ b/gfs2/libgfs2/bitmap.c
@@ -43,10 +43,6 @@
 /* #define BITMAP_MASK(chunksize) (0x10 - 1)                                 */
 #define BITMAP_MASK4(chunksize) (0xf)
 
-uint64_t gfs2_bitmap_size(struct gfs2_bmap *bmap) {
-	return bmap->size;
-}
-
 int gfs2_bitmap_create(struct gfs2_bmap *bmap, uint64_t size,
 					   uint8_t chunksize)
 {
diff --git a/gfs2/libgfs2/block_list.c b/gfs2/libgfs2/block_list.c
index f8790b9..c7c7342 100644
--- a/gfs2/libgfs2/block_list.c
+++ b/gfs2/libgfs2/block_list.c
@@ -79,7 +79,7 @@ void gfs2_special_set(struct special_blocks *blocklist, uint64_t block)
 	return;
 }
 
-void gfs2_special_clear(struct special_blocks *blocklist, uint64_t block)
+static void gfs2_special_clear(struct special_blocks *blocklist, uint64_t block)
 {
 	struct special_blocks *b;
 
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 50a732c..9ea85a5 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -290,7 +290,6 @@ int gfs2_bitmap_set(struct gfs2_bmap *bmap, uint64_t offset, uint8_t val);
 int gfs2_bitmap_get(struct gfs2_bmap *bmap, uint64_t bit, uint8_t *val);
 int gfs2_bitmap_clear(struct gfs2_bmap *bmap, uint64_t offset);
 void gfs2_bitmap_destroy(struct gfs2_bmap *bmap);
-uint64_t gfs2_bitmap_size(struct gfs2_bmap *bmap);
 
 /* block_list.c */
 #define FREE	        (0x0)  /*   0000 */
@@ -361,7 +360,6 @@ struct gfs2_block_list *gfs2_block_list_create(struct gfs2_sbd *sdp,
 					       uint64_t *addl_mem_needed);
 struct special_blocks *blockfind(struct special_blocks *blist, uint64_t num);
 void gfs2_special_set(struct special_blocks *blocklist, uint64_t block);
-void gfs2_special_clear(struct special_blocks *blocklist, uint64_t block);
 void gfs2_special_free(struct special_blocks *blist);
 int gfs2_block_mark(struct gfs2_sbd *sdp, struct gfs2_block_list *il,
 		    uint64_t block, enum gfs2_mark_block mark);