diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-08-22 13:20:38 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-08-22 13:20:38 -0400 |
| commit | 90f33ea604e22afbc83148df87370a2cd8be8d30 (patch) | |
| tree | 5d68c584715730a0327f1d2a560895818df21a6e | |
| parent | 00d440d2f087d9435f4c2020a485252842f5b421 (diff) | |
bcachefs: Fixes for replicas trackingmarcin
| -rw-r--r-- | fs/bcachefs/buckets.c | 19 | ||||
| -rw-r--r-- | fs/bcachefs/replicas.c | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 145944239a49..f9f190e7ef27 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -535,8 +535,6 @@ static int update_replicas(struct bch_fs *c, return -1; } - BUG_ON(!sectors); - switch (r->data_type) { case BCH_DATA_BTREE: fs_usage->btree += sectors; @@ -586,8 +584,12 @@ static inline void update_replicas_list(struct btree_trans *trans, { struct replicas_delta_list *d; struct replicas_delta *n; - unsigned b = replicas_entry_bytes(r) + 8; + unsigned b; + if (!sectors) + return; + + b = replicas_entry_bytes(r) + 8; d = replicas_deltas_realloc(trans, b); n = (void *) d->d + d->used; @@ -1570,12 +1572,6 @@ static int bch2_trans_mark_extent(struct btree_trans *trans, ? sectors : ptr_disk_sectors_delta(p, offset, sectors, flags); - /* - * can happen due to rounding with compressed extents: - */ - if (!disk_sectors) - continue; - ret = bch2_trans_mark_pointer(trans, p, disk_sectors, data_type); if (ret < 0) @@ -1584,7 +1580,7 @@ static int bch2_trans_mark_extent(struct btree_trans *trans, stale = ret > 0; if (p.ptr.cached) { - if (disk_sectors && !stale) + if (!stale) update_cached_sectors_list(trans, p.ptr.dev, disk_sectors); } else if (!p.ec_nr) { @@ -1602,8 +1598,7 @@ static int bch2_trans_mark_extent(struct btree_trans *trans, } } - if (dirty_sectors) - update_replicas_list(trans, &r.e, dirty_sectors); + update_replicas_list(trans, &r.e, dirty_sectors); return 0; } diff --git a/fs/bcachefs/replicas.c b/fs/bcachefs/replicas.c index f84de35cee2b..d06027256e0b 100644 --- a/fs/bcachefs/replicas.c +++ b/fs/bcachefs/replicas.c @@ -80,7 +80,7 @@ static void extent_to_replicas(struct bkey_s_c k, continue; if (p.ec_nr) { - r->nr_devs = 0; + r->nr_required = 0; break; } |