From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 9 Sep 2019 19:37:06 +0000 (-0400)
Subject: libfrog: move bitmap.h to libfrog/
X-Git-Tag: v5.3.0-rc2~142
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fxfsprogs-dev.git;a=commitdiff_plain;h=a58400edd335889ae0db86a8ccececf952ab5939

libfrog: move bitmap.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libfrog/Makefile b/libfrog/Makefile
index e766adba9..2b199b453 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -30,6 +30,7 @@ workqueue.c
 HFILES = \
 avl64.h \
 bulkstat.h \
+bitmap.h \
 crc32defs.h \
 crc32table.h \
 topology.h
diff --git a/include/bitmap.h b/libfrog/bitmap.h
similarity index 87%
rename from include/bitmap.h
rename to libfrog/bitmap.h
index 99a2fb23c..40119b9cb 100644
--- a/include/bitmap.h
+++ b/libfrog/bitmap.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
  * Author: Darrick J. Wong <darrick.wong@oracle.com>
  */
-#ifndef LIBFROG_BITMAP_H_
-#define LIBFROG_BITMAP_H_
+#ifndef __LIBFROG_BITMAP_H__
+#define __LIBFROG_BITMAP_H__
 
 struct bitmap {
 	pthread_mutex_t		bt_lock;
@@ -21,4 +21,4 @@ bool bitmap_test(struct bitmap *bmap, uint64_t start,
 bool bitmap_empty(struct bitmap *bmap);
 void bitmap_dump(struct bitmap *bmap);
 
-#endif /* LIBFROG_BITMAP_H_ */
+#endif /* __LIBFROG_BITMAP_H__ */
diff --git a/repair/rmap.c b/repair/rmap.c
index 47828a06c..5dd6557a0 100644
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -12,7 +12,7 @@
 #include "dinode.h"
 #include "slab.h"
 #include "rmap.h"
-#include "bitmap.h"
+#include "libfrog/bitmap.h"
 
 #undef RMAP_DEBUG
 
diff --git a/scrub/phase6.c b/scrub/phase6.c
index 5628b9268..9b0d228ac 100644
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -12,7 +12,7 @@
 #include "workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
-#include "bitmap.h"
+#include "libfrog/bitmap.h"
 #include "disk.h"
 #include "filemap.h"
 #include "fscounters.h"