bcache: style fix to add a blank line after declarations (1fae7cf0) · Commits · 戴 / test

drivers/md/bcache/alloc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ static void invalidate_buckets_random(struct cache *ca)

		while (!fifo_full(&ca->free_inc)) {
		size_t n;

		get_random_bytes(&n, sizeof(n));

		n %= (size_t) (ca->sb.nbuckets - ca->sb.first_bucket);
		@@ -514,6 +515,7 @@ int bch_bucket_alloc_set(struct cache_set *c, unsigned int reserve,
		struct bkey *k, int n, bool wait)
		{
		int ret;

		mutex_lock(&c->bucket_lock);
		ret = __bch_bucket_alloc_set(c, reserve, k, n, wait);
		mutex_unlock(&c->bucket_lock);
		@@ -706,6 +708,7 @@ int bch_open_buckets_alloc(struct cache_set *c)

		for (i = 0; i < MAX_OPEN_BUCKETS; i++) {
		struct open_bucket b = kzalloc(sizeof(b), GFP_KERNEL);

		if (!b)
		return -ENOMEM;

+1 −0

Original line number	Diff line number	Diff line
		@@ -783,6 +783,7 @@ static inline struct bucket PTR_BUCKET(struct cache_set c,
		static inline uint8_t gen_after(uint8_t a, uint8_t b)
		{
		uint8_t r = a - b;

		return r > 128U ? 0 : r;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -585,6 +585,7 @@ static inline unsigned int bfloat_mantissa(const struct bkey *k,
		struct bkey_float *f)
		{
		const uint64_t *p = &k->low - (f->exponent >> 6);

		return shrd128(p[-1], p[0], f->exponent & 63) & BKEY_MANTISSA_MASK;
		}

		@@ -964,6 +965,7 @@ static struct bset_search_iter bset_search_tree(struct bset_tree *t,
		* but a branch instruction is avoided.
		*/
		unsigned int p = n << 4;

		p &= ((int) (p - t->size)) >> 31;

		prefetch(&t->tree[p]);
		@@ -1114,6 +1116,7 @@ static struct bkey __bch_btree_iter_init(struct btree_keys b,
		struct bset_tree *start)
		{
		struct bkey *ret = NULL;

		iter->size = ARRAY_SIZE(iter->data);
		iter->used = 0;

		@@ -1329,8 +1332,8 @@ void bch_btree_sort_into(struct btree_keys b, struct btree_keys new,
		struct bset_sort_state *state)
		{
		uint64_t start_time = local_clock();

		struct btree_iter iter;

		bch_btree_iter_init(b, &iter, NULL);

		btree_mergesort(b, new->set->data, &iter, false, true);

+7 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,7 @@ err:
		static void btree_node_read_endio(struct bio *bio)
		{
		struct closure *cl = bio->bi_private;

		closure_put(cl);
		}

		@@ -604,6 +605,7 @@ static struct btree mca_bucket_alloc(struct cache_set c,
		struct bkey *k, gfp_t gfp)
		{
		struct btree *b = kzalloc(sizeof(struct btree), gfp);

		if (!b)
		return NULL;

		@@ -746,6 +748,7 @@ void bch_btree_cache_free(struct cache_set *c)
		{
		struct btree *b;
		struct closure cl;

		closure_init_stack(&cl);

		if (c->shrink.list.next)
		@@ -1124,6 +1127,7 @@ static struct btree btree_node_alloc_replacement(struct btree b,
		struct btree_op *op)
		{
		struct btree *n = bch_btree_node_alloc(b->c, op, b->level, b->parent);

		if (!IS_ERR_OR_NULL(n)) {
		mutex_lock(&n->write_lock);
		bch_btree_sort_into(&b->keys, &n->keys, &b->c->sort);
		@@ -2488,6 +2492,7 @@ void bch_refill_keybuf(struct cache_set c, struct keybuf buf,

		if (!RB_EMPTY_ROOT(&buf->keys)) {
		struct keybuf_key *w;

		w = RB_FIRST(&buf->keys, struct keybuf_key, node);
		buf->start = START_KEY(&w->key);

		@@ -2519,6 +2524,7 @@ bool bch_keybuf_check_overlapping(struct keybuf buf, struct bkey start,
		{
		bool ret = false;
		struct keybuf_key p, w, s;

		s.key = *start;

		if (bkey_cmp(end, &buf->start) <= 0 \|\|
		@@ -2545,6 +2551,7 @@ bool bch_keybuf_check_overlapping(struct keybuf buf, struct bkey start,
		struct keybuf_key bch_keybuf_next(struct keybuf buf)
		{
		struct keybuf_key *w;

		spin_lock(&buf->lock);

		w = RB_FIRST(&buf->keys, struct keybuf_key, node);

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ static struct dentry *closure_debug;
		static int debug_seq_show(struct seq_file f, void data)
		{
		struct closure *cl;

		spin_lock_irq(&closure_list_lock);

		list_for_each_entry(cl, &closure_list, all) {