summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/bcache.h
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-12-18 09:01:06 +0100
committerKent Overstreet <kmo@daterainc.com>2014-01-08 22:05:11 +0100
commit0a45114534766058193eb2605c136562a4f7bcc8 (patch)
tree615fd89caaadb0235695551a8a46a5d7f332aa1e /drivers/md/bcache/bcache.h
parentbcache: Btree verify code improvements (diff)
downloadlinux-0a45114534766058193eb2605c136562a4f7bcc8.tar.xz
linux-0a45114534766058193eb2605c136562a4f7bcc8.zip
bcache: Use a mempool for mergesort temporary space
It was a single element mempool before, it's slightly cleaner to just use a real mempool. Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bcache.h')
-rw-r--r--drivers/md/bcache/bcache.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index eb6f2e6927ad..25f017248a81 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -645,12 +645,7 @@ struct cache_set {
*/
mempool_t *fill_iter;
- /*
- * btree_sort() is a merge sort and requires temporary space - single
- * element mempool
- */
- struct mutex sort_lock;
- struct bset *sort;
+ mempool_t *sort_pool;
unsigned sort_crit_factor;
/* List of buckets we're currently writing data to */