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 e766adba94b9d7dea5997a8aad363bb779df120d..2b199b4539f034e02d968a65b45653a6369e46e7 100644 (file)
--- 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 99a2fb23c2a1ba8bea2b6c0585abdf4907bf5ecc..40119b9cb75e73b91dab7e159f526de306b7d93d 100644 (file)
--- 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 47828a06cd64715802732a1299aee745a04868fe..5dd6557a01dcae2eb4df1479097dd538260a2e41 100644 (file)
--- 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 5628b926830e833f61b93696456be40c618d67a1..9b0d228ac1fd01110e8cea245f27bdcaafbcc580 100644 (file)
--- 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"