summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/movinggc.c
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-07-25 03:06:22 +0200
committerKent Overstreet <kmo@daterainc.com>2013-11-11 06:56:30 +0100
commit6054c6d4da1940c7bf8870c6393773aa794f53d8 (patch)
tree5851d01503e16884cc733284ae102d27d0fe71ca /drivers/md/bcache/movinggc.c
parentbcache: Kill op->replace (diff)
downloadlinux-6054c6d4da1940c7bf8870c6393773aa794f53d8.tar.xz
linux-6054c6d4da1940c7bf8870c6393773aa794f53d8.zip
bcache: Don't use op->insert_collision
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>
Diffstat (limited to 'drivers/md/bcache/movinggc.c')
-rw-r--r--drivers/md/bcache/movinggc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/movinggc.c b/drivers/md/bcache/movinggc.c
index c45ba4f21bae..601c96a62b30 100644
--- a/drivers/md/bcache/movinggc.c
+++ b/drivers/md/bcache/movinggc.c
@@ -52,7 +52,7 @@ static void write_moving_finish(struct closure *cl)
bio_for_each_segment_all(bv, bio, i)
__free_page(bv->bv_page);
- if (io->s.op.insert_collision)
+ if (io->s.insert_collision)
trace_bcache_gc_copy_collision(&io->w->key);
bch_keybuf_del(&io->s.c->moving_gc_keys, io->w);