Merge pull request #4707 from ldorau/pmem2-make-pmem2_badblock_clear-take-pmem2_badblock_context

pmem2: make pmem2_badblock_clear() take pmem2_badblock_context

src/include/libpmem2.h

@@ -92,23 +92,23 @@ int pmem2_source_device_idU(const struct pmem2_source *src,
 
 int pmem2_source_device_usc(const struct pmem2_source *src, uint64_t *usc);
 
-struct pmem2_badblock_iterator;
+struct pmem2_badblock_context;
 
 struct pmem2_badblock {
 	size_t offset;
 	size_t length;
 };
 
-int pmem2_badblock_iterator_new(const struct pmem2_source *cfg,
-		struct pmem2_badblock_iterator **pbb);
+int pmem2_badblock_context_new(const struct pmem2_source *src,
+		struct pmem2_badblock_context **bbctx);
 
-int pmem2_badblock_next(struct pmem2_badblock_iterator *pbb,
+int pmem2_badblock_next(struct pmem2_badblock_context *bbctx,
 		struct pmem2_badblock *bb);
 
-void pmem2_badblock_iterator_delete(
-		struct pmem2_badblock_iterator **pbb);
+void pmem2_badblock_context_delete(
+		struct pmem2_badblock_context **bbctx);
 
-int pmem2_badblock_clear(const struct pmem2_source *cfg,
+int pmem2_badblock_clear(struct pmem2_badblock_context *bbctx,
 		const struct pmem2_badblock *bb);
 
 /* config setup */

src/libpmem2/libpmem2.def

@@ -27,9 +27,9 @@ EXPORTS
 	pmem2_get_memmove_fn
 	pmem2_get_memcpy_fn
 	pmem2_get_memset_fn
-	pmem2_badblock_iterator_new
+	pmem2_badblock_context_new
 	pmem2_badblock_next
-	pmem2_badblock_iterator_delete
+	pmem2_badblock_context_delete
 	pmem2_badblock_clear
 	pmem2_source_from_fd
 	pmem2_source_from_anon

src/libpmem2/libpmem2.link.in

@@ -26,9 +26,9 @@ LIBPMEM2_1.0 {
 		pmem2_get_memmove_fn;
 		pmem2_get_memcpy_fn;
 		pmem2_get_memset_fn;
-		pmem2_badblock_iterator_new;
+		pmem2_badblock_context_new;
 		pmem2_badblock_next;
-		pmem2_badblock_iterator_delete;
+		pmem2_badblock_context_delete;
 		pmem2_badblock_clear;
 		pmem2_source_from_fd;
 		pmem2_source_from_anon;

src/libpmem2/source.c

@@ -23,26 +23,26 @@ pmem2_source_delete(struct pmem2_source **src)
 }
 
 int
-pmem2_badblock_iterator_new(const struct pmem2_source *src,
-	struct pmem2_badblock_iterator **pbb)
+pmem2_badblock_context_new(const struct pmem2_source *src,
+	struct pmem2_badblock_context **bbctx)
 {
 	return PMEM2_E_NOSUPP;
 }
 
 int
-pmem2_badblock_next(struct pmem2_badblock_iterator *pbb,
+pmem2_badblock_next(struct pmem2_badblock_context *bbctx,
 	struct pmem2_badblock *bb)
 {
 	return PMEM2_E_NOSUPP;
 }
 
-void pmem2_badblock_iterator_delete(
-	struct pmem2_badblock_iterator **pbb)
+void pmem2_badblock_context_delete(
+	struct pmem2_badblock_context **bbctx)
 {
 }
 
 int
-pmem2_badblock_clear(const struct pmem2_source *src,
+pmem2_badblock_clear(struct pmem2_badblock_context *bbctx,
 	const struct pmem2_badblock *bb)
 {
 	return PMEM2_E_NOSUPP;

src/test/scope/out13.log.match

 pmem2_badblock_clear
-pmem2_badblock_iterator_delete
-pmem2_badblock_iterator_new
+pmem2_badblock_context_delete
+pmem2_badblock_context_new
 pmem2_badblock_next
 pmem2_config_clear_address
 pmem2_config_delete