From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Price Date: Mon, 19 Aug 2013 16:24:31 +0100 Subject: [Cluster-devel] [PATCH] libgfs2: Move the BLOCKMAP_* macros into fsck.gfs2 Message-ID: <1376925871-26531-1-git-send-email-anprice@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit These macros were only being used by fsck.gfs2 so they can safely be moved into gfs2/fsck/util.h Signed-off-by: Andrew Price --- gfs2/fsck/util.h | 4 ++++ gfs2/libgfs2/libgfs2.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) 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, -- 1.8.3.1