diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2014-02-28 05:51:12 +0400 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-03-18 23:24:54 +0400 |
| commit | 3a2fd9d5090b83aab85378a846fa10f39b0b5aa7 (patch) | |
| tree | 13862a06f381010ba9716441d4f844d953472670 /drivers/md/bcache/extents.c | |
| parent | 2531d9ee61fa08a5a9ab8f002c50779888d232c7 (diff) | |
| download | linux-3a2fd9d5090b83aab85378a846fa10f39b0b5aa7.tar.xz | |
bcache: Kill bucket->gc_gen
gc_gen was a temporary used to recalculate last_gc, but since we only need
bucket->last_gc when gc isn't running (gc_mark_valid = 1), we can just update
last_gc directly.
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/extents.c')
| -rw-r--r-- | drivers/md/bcache/extents.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c index 82d5e3288a6c..35887330b49d 100644 --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c @@ -194,9 +194,9 @@ err: mutex_unlock(&b->c->bucket_lock); bch_extent_to_text(buf, sizeof(buf), k); btree_bug(b, -"inconsistent btree pointer %s: bucket %zi pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i", +"inconsistent btree pointer %s: bucket %zi pin %i prio %i gen %i last_gc %i mark %llu", buf, PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin), - g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen); + g->prio, g->gen, g->last_gc, GC_MARK(g)); return true; } @@ -515,9 +515,9 @@ err: mutex_unlock(&b->c->bucket_lock); bch_extent_to_text(buf, sizeof(buf), k); btree_bug(b, -"inconsistent extent pointer %s:\nbucket %zu pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i", +"inconsistent extent pointer %s:\nbucket %zu pin %i prio %i gen %i last_gc %i mark %llu", buf, PTR_BUCKET_NR(b->c, k, ptr), atomic_read(&g->pin), - g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen); + g->prio, g->gen, g->last_gc, GC_MARK(g)); return true; } |