aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/bcache.h
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-07-24 20:29:09 -0400
committerKent Overstreet <kmo@daterainc.com>2013-11-11 00:56:04 -0500
commit35fcd848d72683141052aa9880542461577f2dbe (patch)
treef88ebdbc88c9c7eebf33f603a2deb24e39e2bb9a /drivers/md/bcache/bcache.h
parente8e1d4682c8cb06dbcb5ef7bb851bf9bcb889c84 (diff)
bcache: Convert bucket_wait to wait_queue_head_t
At one point we did do fancy asynchronous waiting stuff with bucket_wait, but that's all gone (and bucket_wait is used a lot less than it used to be). So use the standard primitives. Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bcache.h')
-rw-r--r--drivers/md/bcache/bcache.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index c1c44191afb1..d3520748bc27 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -750,7 +750,7 @@ struct cache_set {
750 * written. 750 * written.
751 */ 751 */
752 atomic_t prio_blocked; 752 atomic_t prio_blocked;
753 struct closure_waitlist bucket_wait; 753 wait_queue_head_t bucket_wait;
754 754
755 /* 755 /*
756 * For any bio we don't skip we subtract the number of sectors from 756 * For any bio we don't skip we subtract the number of sectors from
@@ -1162,13 +1162,13 @@ uint8_t bch_inc_gen(struct cache *, struct bucket *);
1162void bch_rescale_priorities(struct cache_set *, int); 1162void bch_rescale_priorities(struct cache_set *, int);
1163bool bch_bucket_add_unused(struct cache *, struct bucket *); 1163bool bch_bucket_add_unused(struct cache *, struct bucket *);
1164 1164
1165long bch_bucket_alloc(struct cache *, unsigned, struct closure *); 1165long bch_bucket_alloc(struct cache *, unsigned, bool);
1166void bch_bucket_free(struct cache_set *, struct bkey *); 1166void bch_bucket_free(struct cache_set *, struct bkey *);
1167 1167
1168int __bch_bucket_alloc_set(struct cache_set *, unsigned, 1168int __bch_bucket_alloc_set(struct cache_set *, unsigned,
1169 struct bkey *, int, struct closure *); 1169 struct bkey *, int, bool);
1170int bch_bucket_alloc_set(struct cache_set *, unsigned, 1170int bch_bucket_alloc_set(struct cache_set *, unsigned,
1171 struct bkey *, int, struct closure *); 1171 struct bkey *, int, bool);
1172 1172
1173__printf(2, 3) 1173__printf(2, 3)
1174bool bch_cache_set_error(struct cache_set *, const char *, ...); 1174bool bch_cache_set_error(struct cache_set *, const char *, ...);