diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-09 08:27:30 -0900 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-09 09:14:11 -0900 |
| commit | ac1b32acb4ca8c59c0e4911a8d3b27fd72dc54af (patch) | |
| tree | e73a6ea5ddb6f3ece6a3e6c069ffa9ecc5e1ee44 /libbcache/btree_update.c | |
| parent | a17f7bcec7ed810a247c24e56229af8f43a9a6ae (diff) | |
cmd_device_fail
Add a comamnd for setting a device as failed, update bcache sources
Diffstat (limited to 'libbcache/btree_update.c')
| -rw-r--r-- | libbcache/btree_update.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libbcache/btree_update.c b/libbcache/btree_update.c index 95d127fe..43207071 100644 --- a/libbcache/btree_update.c +++ b/libbcache/btree_update.c @@ -94,7 +94,7 @@ bool bch_btree_node_format_fits(struct cache_set *c, struct btree *b, */ static void bch_btree_node_free_index(struct cache_set *c, struct btree *b, enum btree_id id, struct bkey_s_c k, - struct bucket_stats_cache_set *stats) + struct bch_fs_usage *stats) { struct btree_interior_update *as; struct pending_btree_node_free *d; @@ -140,7 +140,7 @@ found: * moving this reference from, hence one comparison here: */ if (gc_pos_cmp(c->gc_pos, gc_phase(GC_PHASE_PENDING_DELETE)) < 0) { - struct bucket_stats_cache_set tmp = { 0 }; + struct bch_fs_usage tmp = { 0 }; bch_mark_key(c, bkey_i_to_s_c(&d->key), -c->sb.btree_node_size, true, b @@ -208,7 +208,7 @@ void bch_btree_node_free_inmem(struct btree_iter *iter, struct btree *b) static void bch_btree_node_free_ondisk(struct cache_set *c, struct pending_btree_node_free *pending) { - struct bucket_stats_cache_set stats = { 0 }; + struct bch_fs_usage stats = { 0 }; BUG_ON(!pending->index_update_done); @@ -258,6 +258,7 @@ retry: ob = bch_alloc_sectors(c, &c->btree_write_point, bkey_i_to_extent(&tmp.k), res->nr_replicas, + c->opts.metadata_replicas_required, use_reserve ? RESERVE_BTREE : RESERVE_NONE, cl); if (IS_ERR(ob)) @@ -373,7 +374,7 @@ static void bch_btree_set_root_inmem(struct cache_set *c, struct btree *b, * bch_btree_root_read()) - do marking while holding * btree_root_lock: */ - struct bucket_stats_cache_set stats = { 0 }; + struct bch_fs_usage stats = { 0 }; bch_mark_key(c, bkey_i_to_s_c(&b->key), c->sb.btree_node_size, true, @@ -632,7 +633,7 @@ static void bch_insert_fixup_btree_ptr(struct btree_iter *iter, struct disk_reservation *disk_res) { struct cache_set *c = iter->c; - struct bucket_stats_cache_set stats = { 0 }; + struct bch_fs_usage stats = { 0 }; struct bkey_packed *k; struct bkey tmp; |