libfrog: move ptvar.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 98f2feb586b93c811eb9b82ec11f2d4f4ec73b22..25ea248ecddd6714c4d845a5cd87c8d8f84d3f49 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -35,6 +35,7 @@ convert.h \
 crc32defs.h \
 crc32table.h \
 fsgeom.h \
+ptvar.h \
 topology.h
 
 LSRCFILES += gen_crc32table.c

diff --git a/include/ptvar.h b/libfrog/ptvar.h
similarity index 83%
rename from include/ptvar.h
rename to libfrog/ptvar.h
index 90823da9e9495d368e3c51839a906cb5c2ac9741..a8803c64116370bc7e546ec67ab1001de18f6a40 100644 (file)
--- a/include/ptvar.h
+++ b/libfrog/ptvar.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
  * Author: Darrick J. Wong <darrick.wong@oracle.com>
  */
-#ifndef LIBFROG_PERCPU_H_
-#define LIBFROG_PERCPU_H_
+#ifndef __LIBFROG_PTVAR_H__
+#define __LIBFROG_PTVAR_H__
 
 struct ptvar;
 
@@ -15,4 +15,4 @@ void ptvar_free(struct ptvar *ptv);
 void *ptvar_get(struct ptvar *ptv);
 bool ptvar_foreach(struct ptvar *ptv, ptvar_iter_fn fn, void *foreach_arg);
 
-#endif /* LIBFROG_PERCPU_H_ */
+#endif /* __LIBFROG_PTVAR_H__ */

diff --git a/scrub/counter.c b/scrub/counter.c
index 4800e751bd98cccec55f210089634feb5340a7f3..4344492763c13f02aeec81436af0a7a046f9d556 100644 (file)
--- a/scrub/counter.c
+++ b/scrub/counter.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <assert.h>
 #include <pthread.h>
-#include "ptvar.h"
+#include "libfrog/ptvar.h"
 #include "counter.h"
 
 /*

diff --git a/scrub/phase7.c b/scrub/phase7.c
index 8a028e191b1c635de87bdf919f32a91ee0f02b94..8ac1da07a8514ba4c4bc36a1a081763e0595160a 100644 (file)
--- a/scrub/phase7.c
+++ b/scrub/phase7.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <sys/statvfs.h>
 #include "path.h"
-#include "ptvar.h"
+#include "libfrog/ptvar.h"
 #include "xfs_scrub.h"
 #include "common.h"
 #include "fscounters.h"

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