alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-03-10 00:00:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang doesn't like nested functions

Browse Source
This commit is contained in:
Kent Overstreet 2016-08-30 16:31:34 -08:00
parent bca2b16e55
commit 580ec0497a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libbcache.c
View File

@ -44,6 +44,13 @@ void __do_write_sb(int fd, void *sb, size_t bytes)
#define do_write_sb(_fd, _sb) \ #define do_write_sb(_fd, _sb) \
__do_write_sb(_fd, _sb, ((void *) __bset_bkey_last(_sb)) - (void *) _sb); __do_write_sb(_fd, _sb, ((void *) __bset_bkey_last(_sb)) - (void *) _sb);
/* minimum size filesystem we can create, given a bucket size: */
static u64 min_size(unsigned bucket_size)
{
return (DIV_ROUND_UP(FIRST_BUCKET_OFFSET, bucket_size) +
BCH_MIN_NR_NBUCKETS) * bucket_size;
}
void bcache_format(struct dev_opts *devs, size_t nr_devs, void bcache_format(struct dev_opts *devs, size_t nr_devs,
unsigned block_size, unsigned block_size,
unsigned btree_node_size, unsigned btree_node_size,
@ -72,15 +79,6 @@ void bcache_format(struct dev_opts *devs, size_t nr_devs,
i->size = get_size(i->path, i->fd); i->size = get_size(i->path, i->fd);
if (!i->bucket_size) { if (!i->bucket_size) {
/*
* minimum size filesystem we can create, given a bucket
* size:
*/
u64 min_size(unsigned bucket_size) {
return (DIV_ROUND_UP(FIRST_BUCKET_OFFSET, bucket_size) +
BCH_MIN_NR_NBUCKETS) * bucket_size;
}
if (i->size < min_size(block_size)) if (i->size < min_size(block_size))
die("cannot format %s, too small (%llu sectors, min %llu)", die("cannot format %s, too small (%llu sectors, min %llu)",
i->path, i->size, min_size(block_size)); i->path, i->size, min_size(block_size));