gfs2-utils: master - libgfs2: Move unused gfs2_bmap into fsck.gfs2

Andrew Price andyp at fedoraproject.org
Fri Sep 5 14:40:31 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=5e925868971f0128fdc7d0dc29031a6770787790
Commit:        5e925868971f0128fdc7d0dc29031a6770787790
Parent:        fd5d78829358675e2cbf511220b7bdfa773a4280
Author:        Andrew Price <anprice at redhat.com>
AuthorDate:    Mon Jun 23 23:35:01 2014 +0100
Committer:     Andrew Price <anprice at redhat.com>
CommitterDate: Fri Sep 5 14:43:05 2014 +0100

libgfs2: Move unused gfs2_bmap into fsck.gfs2

struct gfs2_bmap is only ever used in fsck.gfs2 and functions which use
it were moved out of libgfs2 long ago. Complete that migration by moving
the definition of struct gfs2_bmap into fsck/fsck.h

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

diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index 8555e9e..09db668 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -25,6 +25,12 @@
 
 #define BAD_POINTER_TOLERANCE 10 /* How many bad pointers is too many? */
 
+struct gfs2_bmap {
+	uint64_t size;
+	uint64_t mapsize;
+	unsigned char *map;
+};
+
 struct inode_info
 {
         struct osi_node node;
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 831d45b..10df2d4 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -373,13 +373,6 @@ extern int lgfs2_selfcheck(void);
 extern const struct lgfs2_metadata *lgfs2_find_mtype(uint32_t mh_type, const unsigned versions);
 extern const struct lgfs2_metadata *lgfs2_find_mtype_name(const char *name, const unsigned versions);
 
-/* bitmap.c */
-struct gfs2_bmap {
-	uint64_t size;
-	uint64_t mapsize;
-	unsigned char *map;
-};
-
 /* block_list.c */
 
 extern struct special_blocks *blockfind(struct special_blocks *blist, uint64_t num);


More information about the cluster-commits mailing list