bcache: Minor fixes from kbuild robot (3572324a) · Commits · 戴 / test

drivers/md/bcache/bset.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ void bch_dump_bset(struct btree_keys b, struct bset i, unsigned set)
		for (k = i->start; k < bset_bkey_last(i); k = next) {
		next = bkey_next(k);

		printk(KERN_ERR "block %u key %zi/%u: ", set,
		printk(KERN_ERR "block %u key %li/%u: ", set,
		(uint64_t *) k - i->d, i->keys);

		if (b->ops->key_dump)
		@@ -1185,9 +1185,12 @@ static void __btree_sort(struct btree_keys b, struct btree_iter iter,
		struct bset out = (void ) __get_free_pages(__GFP_NOWARN\|GFP_NOIO,
		order);
		if (!out) {
		struct page *outp;

		BUG_ON(order > state->page_order);

		out = page_address(mempool_alloc(state->pool, GFP_NOIO));
		outp = mempool_alloc(state->pool, GFP_NOIO);
		out = page_address(outp);
		used_mempool = true;
		order = state->page_order;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1805,7 +1805,7 @@ static bool btree_insert_key(struct btree b, struct bkey k,

		static size_t insert_u64s_remaining(struct btree *b)
		{
		ssize_t ret = bch_btree_keys_u64s_remaining(&b->keys);
		long ret = bch_btree_keys_u64s_remaining(&b->keys);

		/*
		* Might land in the middle of an existing extent and have to split it

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ err:
		mutex_unlock(&b->c->bucket_lock);
		bch_extent_to_text(buf, sizeof(buf), k);
		btree_bug(b,
		"inconsistent btree pointer %s: bucket %li pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i",
		"inconsistent btree pointer %s: bucket %zi pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i",
		buf, PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin),
		g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen);
		return true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,7 @@ static int btree_bset_stats(struct btree_op b_op, struct btree b)
		return MAP_CONTINUE;
		}

		int bch_bset_print_stats(struct cache_set c, char buf)
		static int bch_bset_print_stats(struct cache_set c, char buf)
		{
		struct bset_stats_op op;
		int ret;