emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ft-lib/bcache] rename raise() -> raise_()

Browse Source 
Name clash with signal.h on Debian and Gentoo.
This commit is contained in:
Joe Thornber 2019-06-05 15:02:05 +01:00
parent 5e5409f48b
commit 6332962ee8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ft-lib/bcache.c
View File

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