|
 |
1ece8d |
commit f485b63bc2c0daa6b84d0c376fecb74c2d3784bd
|
|
|
1ece8d |
Author: Andrew Price <anprice@redhat.com>
|
|
|
1ece8d |
Date: Mon Aug 19 16:21:28 2013 +0100
|
|
|
1ece8d |
|
|
|
1ece8d |
libgfs2: Move the BLOCKMAP_* macros into fsck.gfs2
|
|
|
1ece8d |
|
|
|
1ece8d |
These macros were only being used by fsck.gfs2 so they can safely be
|
|
|
1ece8d |
moved into gfs2/fsck/util.h
|
|
|
1ece8d |
|
|
|
1ece8d |
Resolves: bz#1001583
|
|
|
1ece8d |
|
|
|
1ece8d |
Signed-off-by: Andrew Price <anprice@redhat.com>
|
|
|
1ece8d |
|
|
|
1ece8d |
diff --git a/gfs2/fsck/util.h b/gfs2/fsck/util.h
|
|
|
1ece8d |
index 580acd8..276c726 100644
|
|
|
1ece8d |
--- a/gfs2/fsck/util.h
|
|
|
1ece8d |
+++ b/gfs2/fsck/util.h
|
|
|
1ece8d |
@@ -23,6 +23,10 @@ extern void dup_listent_delete(struct duptree *dt, struct inode_with_dups *id);
|
|
|
1ece8d |
|
|
|
1ece8d |
extern const char *reftypes[ref_types + 1];
|
|
|
1ece8d |
|
|
|
1ece8d |
+#define BLOCKMAP_SIZE4(size) ((size) >> 1)
|
|
|
1ece8d |
+#define BLOCKMAP_BYTE_OFFSET4(x) (((x) & 0x0000000000000001) << 2)
|
|
|
1ece8d |
+#define BLOCKMAP_MASK4 (0xf)
|
|
|
1ece8d |
+
|
|
|
1ece8d |
static inline uint8_t block_type(uint64_t bblock)
|
|
|
1ece8d |
{
|
|
|
1ece8d |
static unsigned char *byte;
|
|
|
1ece8d |
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
|
|
|
1ece8d |
index dd7420b..1548cf3 100644
|
|
|
1ece8d |
--- a/gfs2/libgfs2/libgfs2.h
|
|
|
1ece8d |
+++ b/gfs2/libgfs2/libgfs2.h
|
|
|
1ece8d |
@@ -68,10 +68,6 @@ __BEGIN_DECLS
|
|
|
1ece8d |
|
|
|
1ece8d |
#endif /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
|
1ece8d |
|
|
|
1ece8d |
-#define BLOCKMAP_SIZE4(size) (size >> 1)
|
|
|
1ece8d |
-#define BLOCKMAP_BYTE_OFFSET4(x) ((x & 0x0000000000000001) << 2)
|
|
|
1ece8d |
-#define BLOCKMAP_MASK4 (0xf)
|
|
|
1ece8d |
-
|
|
|
1ece8d |
enum lgfs2_meta_type {
|
|
|
1ece8d |
LGFS2_MT_GFS2_SB = 0,
|
|
|
1ece8d |
LGFS2_MT_GFS_SB = 1,
|