Blame SOURCES/dmpd-tests-lib-bcache-rename-raise-raise_.patch

079460
 ft-lib/bcache.c | 16 ++++++++--------
079460
 1 file changed, 8 insertions(+), 8 deletions(-)
079460
079460
diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
079460
index 0dca503..ee5b6c5 100644
079460
--- a/ft-lib/bcache.c
079460
+++ b/ft-lib/bcache.c
079460
@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
079460
 }
079460
 
079460
 // FIXME: raise a condition somehow?
079460
-static void raise(const char *fmt, ...)
079460
+static void raise_(const char *fmt, ...)
079460
 {
079460
 	va_list ap;
079460
 
079460
@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
079460
 	struct list_head *l;
079460
 
079460
 	if (head->next == head)
079460
-		raise("list is empty\n");
079460
+		raise_("list is empty\n");
079460
 
079460
 	l = head->next;
079460
 	list_del(l);
079460
@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
079460
 static void cb_set_destroy(struct cb_set *cbs)
079460
 {
079460
 	if (!list_empty(&cbs->allocated))
079460
-		raise("async io still in flight");
079460
+		raise_("async io still in flight");
079460
 
079460
 	free(cbs->vec);
079460
 	free(cbs);
079460
@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
079460
 	uint64_t s;
079460
 
079460
 	if (fd < 0) {
079460
-		raise("couldn't open cache file");
079460
+		raise_("couldn't open cache file");
079460
 		return NULL;
079460
 	}
079460
 
079460
 	r = fstat(fd, &info;;
079460
 	if (r < 0) {
079460
-		raise("couldn't stat cache file");
079460
+		raise_("couldn't stat cache file");
079460
 		return NULL;
079460
 	}
079460
 
079460
@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
079460
 static void check_index(struct bcache *cache, block_address index)
079460
 {
079460
 	if (index >= cache->nr_data_blocks)
079460
-		raise("block out of bounds (%llu >= %llu)",
079460
+		raise_("block out of bounds (%llu >= %llu)",
079460
 		      (unsigned long long) index,
079460
 		      (unsigned long long) cache->nr_data_blocks);
079460
 }
079460
@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
079460
 		// FIXME: this is insufficient.  We need to also catch a read
079460
 		// lock of a write locked block.  Ref count needs to distinguish.
079460
 		if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
079460
-			raise("concurrent write lock attempt");
079460
+			raise_("concurrent write lock attempt");
079460
 
079460
 		if (test_flags(b, BF_IO_PENDING)) {
079460
 			miss(cache, flags);
079460
@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
079460
 		return b;
079460
 	}
079460
 
079460
-	raise("couldn't get block");
079460
+	raise_("couldn't get block");
079460
 	return NULL;
079460
 }
079460