diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-07-24 16:46:42 -0700 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-10 21:56:34 -0800 |
commit | 3a3b6a4e075188342b58d4b6560f5540af64cac0 (patch) | |
tree | 5c64e4cdcb292d3b0a9e1d9f16e461ff5c4fdcbe /drivers/md/bcache/alloc.c | |
parent | 280481d06c8a683d9aaa26125476222e76b733c5 (diff) | |
download | linux-stable-3a3b6a4e075188342b58d4b6560f5540af64cac0.tar.gz linux-stable-3a3b6a4e075188342b58d4b6560f5540af64cac0.tar.bz2 linux-stable-3a3b6a4e075188342b58d4b6560f5540af64cac0.zip |
bcache: Don't bother with bucket refcount for btree node allocations
The bucket refcount (dropped with bkey_put()) is only needed to prevent
the newly allocated bucket from being garbage collected until we've
added a pointer to it somewhere. But for btree node allocations, the
fact that we have btree nodes locked is enough to guard against races
with garbage collection.
Eventually the per bucket refcount is going to be replaced with
something specific to bch_alloc_sectors().
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/alloc.c')
-rw-r--r-- | drivers/md/bcache/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index ed5920b20c61..2b46bf1d7e40 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c @@ -472,7 +472,7 @@ int __bch_bucket_alloc_set(struct cache_set *c, unsigned watermark, return 0; err: bch_bucket_free(c, k); - __bkey_put(c, k); + bkey_put(c, k); return -1; } @@ -588,7 +588,7 @@ bool bch_alloc_sectors(struct cache_set *c, struct bkey *k, unsigned sectors, * didn't use it, drop the refcount bch_bucket_alloc_set() took: */ if (KEY_PTRS(&alloc.key)) - __bkey_put(c, &alloc.key); + bkey_put(c, &alloc.key); for (i = 0; i < KEY_PTRS(&b->key); i++) EBUG_ON(ptr_stale(c, &b->key, i)); |