Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcache: Don't use op->insert_collision

Browse Source 
When we convert bch_btree_insert() to bch_btree_map_leaf_nodes(), we
won't be passing struct btree_op to bch_btree_insert() anymore - so we
need a different way of returning whether there was a collision (really,
a replace collision).

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
This commit is contained in:
Kent Overstreet 2013-07-24 18:06:22 -07:00
parent 1b207d80d5
commit 6054c6d4da
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/md/bcache/btree.c
View File

@ -2227,6 +2227,9 @@ int bch_btree_insert(struct btree_op *op, struct cache_set *c,
} }
} }
if (op->insert_collision)
return -ESRCH;
return ret; return ret;
} }

2
drivers/md/bcache/movinggc.c
View File

@ -52,7 +52,7 @@ static void write_moving_finish(struct closure *cl)
bio_for_each_segment_all(bv, bio, i) bio_for_each_segment_all(bv, bio, i)
__free_page(bv->bv_page); __free_page(bv->bv_page);
if (io->s.op.insert_collision) if (io->s.insert_collision)
trace_bcache_gc_copy_collision(&io->w->key); trace_bcache_gc_copy_collision(&io->w->key);
bch_keybuf_del(&io->s.c->moving_gc_keys, io->w); bch_keybuf_del(&io->s.c->moving_gc_keys, io->w);

10
drivers/md/bcache/request.c
View File

@ -218,6 +218,7 @@ static void bch_data_insert_keys(struct closure *cl)
struct search *s = container_of(cl, struct search, btree); struct search *s = container_of(cl, struct search, btree);
atomic_t *journal_ref = NULL; atomic_t *journal_ref = NULL;
struct bkey *replace_key = s->replace ? &s->replace_key : NULL; struct bkey *replace_key = s->replace ? &s->replace_key : NULL;
int ret;
/* /*
* If we're looping, might already be waiting on * If we're looping, might already be waiting on
@ -236,8 +237,11 @@ static void bch_data_insert_keys(struct closure *cl)
s->flush_journal s->flush_journal
? &s->cl : NULL); ? &s->cl : NULL);
if (bch_btree_insert(&s->op, s->c, &s->insert_keys, ret = bch_btree_insert(&s->op, s->c, &s->insert_keys,
journal_ref, replace_key)) { journal_ref, replace_key);
if (ret == -ESRCH) {
s->insert_collision = true;
} else if (ret) {
s->error = -ENOMEM; s->error = -ENOMEM;
s->insert_data_done = true; s->insert_data_done = true;
} }
@ -977,7 +981,7 @@ static void cached_dev_cache_miss_done(struct closure *cl)
{ {
struct search *s = container_of(cl, struct search, cl); struct search *s = container_of(cl, struct search, cl);
if (s->op.insert_collision) if (s->insert_collision)
bch_mark_cache_miss_collision(s); bch_mark_cache_miss_collision(s);
if (s->cache_bio) { if (s->cache_bio) {

1
drivers/md/bcache/request.h
View File

@ -34,6 +34,7 @@ struct search {
unsigned insert_data_done:1; unsigned insert_data_done:1;
unsigned replace:1; unsigned replace:1;
unsigned insert_collision:1;
uint16_t write_prio; uint16_t write_prio;

7
drivers/md/bcache/writeback.c
View File

@ -142,6 +142,7 @@ static void write_dirty_finish(struct closure *cl)
unsigned i; unsigned i;
struct btree_op op; struct btree_op op;
struct keylist keys; struct keylist keys;
int ret;
bch_btree_op_init(&op, -1); bch_btree_op_init(&op, -1);
bch_keylist_init(&keys); bch_keylist_init(&keys);
@ -153,12 +154,12 @@ static void write_dirty_finish(struct closure *cl)
for (i = 0; i < KEY_PTRS(&w->key); i++) for (i = 0; i < KEY_PTRS(&w->key); i++)
atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin); atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin);
bch_btree_insert(&op, dc->disk.c, &keys, NULL, &w->key); ret = bch_btree_insert(&op, dc->disk.c, &keys, NULL, &w->key);
if (op.insert_collision) if (ret)
trace_bcache_writeback_collision(&w->key); trace_bcache_writeback_collision(&w->key);
atomic_long_inc(op.insert_collision atomic_long_inc(ret
? &dc->disk.c->writeback_keys_failed ? &dc->disk.c->writeback_keys_failed
: &dc->disk.c->writeback_keys_done); : &dc->disk.c->writeback_keys_done);
} }