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

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 98f2feb58..25ea248ec 100644
--- 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 90823da9e..a8803c641 100644
--- 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 4800e751b..434449276 100644
--- 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 8a028e191..8ac1da07a 100644
--- 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 4a9b91f29..d56f48936 100644
--- 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"