diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-01 01:45:15 -0900 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-08 02:34:33 -0900 |
| commit | 06b73dbd7ffc0296b2ecea8d3bc55bfeb72d7f2a (patch) | |
| tree | 1ba37985a18eb2d9a9616ee160c82339e23e2160 /libbcache/movinggc.c | |
| parent | 171ee48e57be78f4e95954c99851553fa523bf91 (diff) | |
cmd_migratedisk-format-changes
Diffstat (limited to 'libbcache/movinggc.c')
| -rw-r--r-- | libbcache/movinggc.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libbcache/movinggc.c b/libbcache/movinggc.c index e40dfbc..27f5c63 100644 --- a/libbcache/movinggc.c +++ b/libbcache/movinggc.c @@ -191,7 +191,7 @@ static void bch_moving_gc(struct cache *ca) } if (g->mark.owned_by_allocator || - g->mark.is_metadata) + g->mark.data_type != BUCKET_DATA) continue; sectors_used = bucket_sectors_used(g); @@ -258,18 +258,21 @@ static int bch_moving_gc_thread(void *arg) return 0; } -void bch_moving_init_cache(struct cache *ca) +void bch_moving_gc_stop(struct cache *ca) { - bch_pd_controller_init(&ca->moving_gc_pd); - ca->moving_gc_pd.d_term = 0; + ca->moving_gc_pd.rate.rate = UINT_MAX; + bch_ratelimit_reset(&ca->moving_gc_pd.rate); + + if (ca->moving_gc_read) + kthread_stop(ca->moving_gc_read); + ca->moving_gc_read = NULL; } -int bch_moving_gc_thread_start(struct cache *ca) +int bch_moving_gc_start(struct cache *ca) { struct task_struct *t; - /* The moving gc read thread must be stopped */ - BUG_ON(ca->moving_gc_read != NULL); + BUG_ON(ca->moving_gc_read); if (ca->set->opts.nochanges) return 0; @@ -287,12 +290,8 @@ int bch_moving_gc_thread_start(struct cache *ca) return 0; } -void bch_moving_gc_stop(struct cache *ca) +void bch_dev_moving_gc_init(struct cache *ca) { - ca->moving_gc_pd.rate.rate = UINT_MAX; - bch_ratelimit_reset(&ca->moving_gc_pd.rate); - - if (ca->moving_gc_read) - kthread_stop(ca->moving_gc_read); - ca->moving_gc_read = NULL; + bch_pd_controller_init(&ca->moving_gc_pd); + ca->moving_gc_pd.d_term = 0; } |