From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26661 invoked by alias); 23 Jan 2009 15:38:09 -0000 Received: (qmail 26652 invoked by alias); 23 Jan 2009 15:38:09 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - libgfs2: More fixes in bitmap.c and block_list.c To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: bd8d5389aa8c1bd3a9c0d6f3236900f1fb2f0c70 X-Git-Newrev: 6834a0bf614b62e2006c0aa4c333954279dfefa8 From: "Fabio M. Di Nitto" Message-Id: <20090123153749.43547C07B8@lists.fedorahosted.org> Date: Fri, 23 Jan 2009 15:38:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00233.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6834a0bf614b62e2006c0aa4c333954279dfefa8 Commit: 6834a0bf614b62e2006c0aa4c333954279dfefa8 Parent: bd8d5389aa8c1bd3a9c0d6f3236900f1fb2f0c70 Author: Steven Whitehouse AuthorDate: Fri Jan 23 13:57:59 2009 +0000 Committer: Fabio M. Di Nitto CommitterDate: Fri Jan 23 16:37:31 2009 +0100 libgfs2: More fixes in bitmap.c and block_list.c Signed-off-by: Steven Whitehouse --- 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);