libfrog: move workqueue.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 482893efcd9bc074442eae85704737fd9e96a7cf..5506c96f957c698b95e6dce172d8b3413c93fccc 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -37,7 +37,8 @@ crc32table.h \
 fsgeom.h \
 ptvar.h \
 radix-tree.h \
-topology.h
+topology.h \
+workqueue.h
 
 LSRCFILES += gen_crc32table.c
 

diff --git a/include/workqueue.h b/libfrog/workqueue.h
similarity index 89%
rename from include/workqueue.h
rename to libfrog/workqueue.h
index c45dc4fbcf6414424fc55440d9c491ca5b18509b..a1f3a57c3d8dd66cef12d01cc86e6e10a8ad5d4c 100644 (file)
--- a/include/workqueue.h
+++ b/libfrog/workqueue.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2017 Oracle.  All Rights Reserved.
  * Author: Darrick J. Wong <darrick.wong@oracle.com>
  */
-#ifndef        _WORKQUEUE_H_
-#define        _WORKQUEUE_H_
+#ifndef        __LIBFROG_WORKQUEUE_H__
+#define        __LIBFROG_WORKQUEUE_H__
 
 #include <pthread.h>
 
@@ -38,4 +38,4 @@ int workqueue_add(struct workqueue *wq, workqueue_func_t fn,
                uint32_t index, void *arg);
 void workqueue_destroy(struct workqueue *wq);
 
-#endif /* _WORKQUEUE_H_ */
+#endif /* __LIBFROG_WORKQUEUE_H__ */

diff --git a/repair/threads.h b/repair/threads.h
index 22f74d1f6689fb0279b9e01d94443a964baa3bb3..55c7c6327d7a260a891abcb3e336ea1bd1c5de1f 100644 (file)
--- a/repair/threads.h
+++ b/repair/threads.h
@@ -3,7 +3,7 @@
 #ifndef        _XFS_REPAIR_THREADS_H_
 #define        _XFS_REPAIR_THREADS_H_
 
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 
 void   thread_init(void);
 

diff --git a/scrub/fscounters.c b/scrub/fscounters.c
index f8cc1e947a9599ac203692cd5550174149c5c94d..9635c44f5208c6b8e2bba4eebfceebf17eabf17c 100644 (file)
--- a/scrub/fscounters.c
+++ b/scrub/fscounters.c
@@ -11,7 +11,7 @@
 #include "xfs_arch.h"
 #include "xfs_format.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "fscounters.h"

diff --git a/scrub/inodes.c b/scrub/inodes.c
index faffef54324796a1da146e2a9be92aa7d40de3ee..19923de573df259172989122d53fb142cebdaf92 100644 (file)
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -13,7 +13,7 @@
 #include "xfs_format.h"
 #include "handle.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "inodes.h"

diff --git a/scrub/phase1.c b/scrub/phase1.c
index 23df9a1502670beb76b2e0ee8f94e828d043714e..d0e77cabe0d496f80745b5b6a50aa8231470a3eb 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <pthread.h>
 #include "libfrog.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "input.h"
 #include "path.h"
 #include "handle.h"

diff --git a/scrub/phase2.c b/scrub/phase2.c
index a80da7fd7858f81bb605d45b4cccafa056d2f14e..baec11dd9f915da7feeea8c25166bc035a3b770e 100644 (file)
--- a/scrub/phase2.c
+++ b/scrub/phase2.c
@@ -9,7 +9,7 @@
 #include <sys/statvfs.h>
 #include "list.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "scrub.h"

diff --git a/scrub/phase3.c b/scrub/phase3.c
index 8c02f1cb19e05c47b33f09ae3a8f3a6e149982b6..64a499c3b121d7c17ff7f36b4d88b0913edc5d9c 100644 (file)
--- a/scrub/phase3.c
+++ b/scrub/phase3.c
@@ -9,7 +9,7 @@
 #include <sys/statvfs.h>
 #include "list.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "counter.h"

diff --git a/scrub/phase4.c b/scrub/phase4.c
index 49f00723cb5ca5e21aaea45487a5489c4e9593f7..140748358f72268748ba068a8746e6a0b13ce933 100644 (file)
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -10,7 +10,7 @@
 #include <sys/statvfs.h>
 #include "list.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "progress.h"

diff --git a/scrub/phase5.c b/scrub/phase5.c
index f3ee22e6a3dfe42d305de50c1fca1e9bd99e4750..ab015821a7e59b9b43f227bd3869c6f4f34c2464 100644 (file)
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -15,7 +15,7 @@
 #include "handle.h"
 #include "list.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "inodes.h"

diff --git a/scrub/phase6.c b/scrub/phase6.c
index 9b0d228ac1fd01110e8cea245f27bdcaafbcc580..d0e62cea93ce1f4d986f6c2ad6e9cb0acd583691 100644 (file)
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -9,7 +9,7 @@
 #include <sys/statvfs.h>
 #include "handle.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "libfrog/bitmap.h"

diff --git a/scrub/read_verify.c b/scrub/read_verify.c
index d56f489366579a6bca4bfc55a5273b57e98ae290..828f6be64de2e5cc84dbaca6d53ec55f28f13c4c 100644 (file)
--- a/scrub/read_verify.c
+++ b/scrub/read_verify.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <sys/statvfs.h>
 #include "libfrog/ptvar.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "path.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/spacemap.c b/scrub/spacemap.c
index c3621a3ab292263e6acfb29e3fba1e4f10055a0b..774efbaaece0fff28772626a9d0f859c9d506697 100644 (file)
--- a/scrub/spacemap.c
+++ b/scrub/spacemap.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <sys/statvfs.h>
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "path.h"
 #include "xfs_scrub.h"
 #include "common.h"

diff --git a/scrub/vfs.c b/scrub/vfs.c
index 7b0b5bcd91605021581e115b9e3f2415f45634bf..7d79e7f78bd43ddd25266d33ed09834de52e3a22 100644 (file)
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -10,7 +10,7 @@
 #include <sys/statvfs.h>
 #include "handle.h"
 #include "path.h"
-#include "workqueue.h"
+#include "libfrog/workqueue.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "vfs.h"