diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-04 22:18:23 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-04 22:21:00 -0500 |
| commit | db8cffeaed01c917863d3f12b0203615a303ab8e (patch) | |
| tree | c506b718c5c38dd1cb40030502ae565e548ce7b5 /libbcachefs/buckets.c | |
| parent | 6da91e81cc8b84e0efff09b40dffa004b4c0be90 (diff) | |
Update bcachefs sources to 8bf4b038d4 bcachefs: Assorted fixes for running on very small devices
Diffstat (limited to 'libbcachefs/buckets.c')
| -rw-r--r-- | libbcachefs/buckets.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libbcachefs/buckets.c b/libbcachefs/buckets.c index 271c02f1..15a07e36 100644 --- a/libbcachefs/buckets.c +++ b/libbcachefs/buckets.c @@ -299,11 +299,6 @@ u64 bch2_fs_sectors_used(struct bch_fs *c, struct bch_fs_usage stats) return min(c->capacity, __bch2_fs_sectors_used(c, stats)); } -static u64 bch2_fs_sectors_free(struct bch_fs *c, struct bch_fs_usage stats) -{ - return c->capacity - bch2_fs_sectors_used(c, stats); -} - static inline int is_unavailable_bucket(struct bucket_mark m) { return !is_available_bucket(m); @@ -883,9 +878,9 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets) size_t btree_reserve = DIV_ROUND_UP(BTREE_NODE_RESERVE, ca->mi.bucket_size / c->opts.btree_node_size); /* XXX: these should be tunable */ - size_t reserve_none = max_t(size_t, 4, nbuckets >> 9); - size_t copygc_reserve = max_t(size_t, 16, nbuckets >> 7); - size_t free_inc_nr = max(max_t(size_t, 16, nbuckets >> 12), + size_t reserve_none = max_t(size_t, 1, nbuckets >> 9); + size_t copygc_reserve = max_t(size_t, 2, nbuckets >> 7); + size_t free_inc_nr = max(max_t(size_t, 1, nbuckets >> 12), btree_reserve); bool resize = ca->buckets != NULL, start_copygc = ca->copygc_thread != NULL; |