diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-03-03 16:16:03 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-03-14 20:11:32 -0400 |
| commit | 3f1529ed45674d232c33fb2f4725d92b51f57fc1 (patch) | |
| tree | 5ac6da38a90aee25f3e6d716695e0089f16d563b /fs/bcachefs/buckets.c | |
| parent | 28461f036c5486ff4da862c760a3375ee4c8df83 (diff) | |
bcachefs: fix copygc so it doesn't spin when no work to do
Diffstat (limited to 'fs/bcachefs/buckets.c')
| -rw-r--r-- | fs/bcachefs/buckets.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 4ea89a97c45c..864de940f1e7 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -285,6 +285,17 @@ static inline int is_unavailable_bucket(struct bucket_mark m) return !is_available_bucket(m); } +static inline int is_fragmented_bucket(struct bucket_mark m, + struct bch_dev *ca) +{ + if (!m.owned_by_allocator && + m.data_type == BCH_DATA_USER && + bucket_sectors_used(m)) + return max_t(int, 0, (int) ca->mi.bucket_size - + bucket_sectors_used(m)); + return 0; +} + static inline enum bch_data_type bucket_type(struct bucket_mark m) { return m.cached_sectors && !m.dirty_sectors @@ -361,6 +372,8 @@ static void bch2_dev_usage_update(struct bch_fs *c, struct bch_dev *ca, dev_usage->sectors[new.data_type] += new.dirty_sectors; dev_usage->sectors[BCH_DATA_CACHED] += (int) new.cached_sectors - (int) old.cached_sectors; + dev_usage->sectors_fragmented += + is_fragmented_bucket(new, ca) - is_fragmented_bucket(old, ca); if (!is_available_bucket(old) && is_available_bucket(new)) bch2_wake_allocator(ca); |