commit f485b63bc2c0daa6b84d0c376fecb74c2d3784bd
Author: Andrew Price <anprice@redhat.com>
Date:   Mon Aug 19 16:21:28 2013 +0100

    libgfs2: Move the BLOCKMAP_* macros into fsck.gfs2
    
    These macros were only being used by fsck.gfs2 so they can safely be
    moved into gfs2/fsck/util.h
    
    Resolves: bz#1001583
    
    Signed-off-by: Andrew Price <anprice@redhat.com>

diff --git a/gfs2/fsck/util.h b/gfs2/fsck/util.h
index 580acd8..276c726 100644
--- a/gfs2/fsck/util.h
+++ b/gfs2/fsck/util.h
@@ -23,6 +23,10 @@ extern void dup_listent_delete(struct duptree *dt, struct inode_with_dups *id);
 
 extern const char *reftypes[ref_types + 1];
 
+#define BLOCKMAP_SIZE4(size) ((size) >> 1)
+#define BLOCKMAP_BYTE_OFFSET4(x) (((x) & 0x0000000000000001) << 2)
+#define BLOCKMAP_MASK4 (0xf)
+
 static inline uint8_t block_type(uint64_t bblock)
 {
 	static unsigned char *byte;
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index dd7420b..1548cf3 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -68,10 +68,6 @@ __BEGIN_DECLS
 
 #endif  /*  __BYTE_ORDER == __LITTLE_ENDIAN  */
 
-#define BLOCKMAP_SIZE4(size) (size >> 1)
-#define BLOCKMAP_BYTE_OFFSET4(x) ((x & 0x0000000000000001) << 2)
-#define BLOCKMAP_MASK4 (0xf)
-
 enum lgfs2_meta_type {
 	LGFS2_MT_GFS2_SB = 0,
 	LGFS2_MT_GFS_SB = 1,