diff options
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_fsck.c | 1 | ||||
| -rw-r--r-- | c_src/cmd_image.c | 5 | ||||
| -rw-r--r-- | c_src/libbcachefs.c | 22 |
3 files changed, 24 insertions, 4 deletions
diff --git a/c_src/cmd_fsck.c b/c_src/cmd_fsck.c index 8c37b1ba..17e3af4d 100644 --- a/c_src/cmd_fsck.c +++ b/c_src/cmd_fsck.c @@ -208,6 +208,7 @@ static void fsck_usage(void) " -f Force checking even if filesystem is marked clean\n" " -r, --ratelimit_errors Don't display more than 10 errors of a given type\n" " -k, --kernel Use the in-kernel fsck implementation\n" + " -K, --no-kernel\n" " -v Be verbose\n" " -h, --help Display this help and exit\n" "Report bugs to <linux-bcachefs@vger.kernel.org>"); diff --git a/c_src/cmd_image.c b/c_src/cmd_image.c index d00d85cf..467378b0 100644 --- a/c_src/cmd_image.c +++ b/c_src/cmd_image.c @@ -665,7 +665,10 @@ static int image_update(const char *src_path, const char *dst_image, goto err; } - if (ftruncate(dev_opts.bdev->bd_fd, input_bytes)) { + u64 metadata_dev_size = max(input_bytes, + c->opts.btree_node_size * BCH_MIN_NR_NBUCKETS); + + if (ftruncate(dev_opts.bdev->bd_fd, metadata_dev_size)) { fprintf(stderr, "ftruncate error: %m"); goto err; } diff --git a/c_src/libbcachefs.c b/c_src/libbcachefs.c index 935b13ce..2b5ca211 100644 --- a/c_src/libbcachefs.c +++ b/c_src/libbcachefs.c @@ -79,9 +79,25 @@ void bch2_sb_layout_init(struct bch_sb_layout *l, } } -static u64 dev_max_bucket_size(u64 dev_size) +static u64 dev_bucket_size_clamp(struct bch_opts fs_opts, u64 dev_size, u64 fs_bucket_size) { - return rounddown_pow_of_two(dev_size / (BCH_MIN_NR_NBUCKETS * 4)); + u64 max_size = rounddown_pow_of_two(dev_size / (BCH_MIN_NR_NBUCKETS * 4)); + if (opt_defined(fs_opts, btree_node_size)) + max_size = max(max_size, fs_opts.btree_node_size); + if (max_size * BCH_MIN_NR_NBUCKETS > dev_size) + die("bucket size %llu too big for device size", max_size); + + u64 dev_bucket_size = min(max_size, fs_bucket_size); + + /* + * Use encoded_extent_max instead of 64k? + */ + + while (dev_bucket_size < 64 << 10 && + dev_size / (dev_bucket_size * 2) >= BCH_MIN_NR_NBUCKETS) + dev_bucket_size *= 2; + + return dev_bucket_size; } u64 bch2_pick_bucket_size(struct bch_opts opts, dev_opts_list devs) @@ -209,7 +225,7 @@ struct bch_sb *bch2_format(struct bch_opt_strs fs_opt_strs, darray_for_each(devs, i) if (!opt_defined(i->opts, bucket_size)) opt_set(i->opts, bucket_size, - min(fs_bucket_size, dev_max_bucket_size(i->fs_size))); + dev_bucket_size_clamp(fs_opts, i->fs_size, fs_bucket_size)); darray_for_each(devs, i) { i->nbuckets = i->fs_size / i->opts.bucket_size; |