Commit 11e9560e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bcache: remove PTR_CACHE 



Remove the PTR_CACHE inline and replace it with a direct dereference
of c->cache.

(Coly Li: fix the typo from PTR_BUCKET to PTR_CACHE in commit log)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20210411134316.80274-3-colyli@suse.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 13e1db65

drivers/md/bcache/alloc.c

+2 −3
Original line number Diff line number Diff line
@@ -482,8 +482,7 @@ void bch_bucket_free(struct cache_set *c, struct bkey *k) 
	unsigned int i;



	for (i = 0; i < KEY_PTRS(k); i++)

		__bch_bucket_free(PTR_CACHE(c, k, i),

				  PTR_BUCKET(c, k, i));

		__bch_bucket_free(c->cache, PTR_BUCKET(c, k, i));

}



int __bch_bucket_alloc_set(struct cache_set *c, unsigned int reserve,
@@ -674,7 +673,7 @@ bool bch_alloc_sectors(struct cache_set *c, 
		SET_PTR_OFFSET(&b->key, i, PTR_OFFSET(&b->key, i) + sectors);



		atomic_long_add(sectors,

				&PTR_CACHE(c, &b->key, i)->sectors_written);

				&c->cache->sectors_written);

	}



	if (b->sectors_free < c->cache->sb.block_size)

drivers/md/bcache/bcache.h

+2 −9
Original line number Diff line number Diff line
@@ -804,13 +804,6 @@ static inline sector_t bucket_remainder(struct cache_set *c, sector_t s) 
	return s & (c->cache->sb.bucket_size - 1);

}



static inline struct cache *PTR_CACHE(struct cache_set *c,

				      const struct bkey *k,

				      unsigned int ptr)

{

	return c->cache;

}



static inline size_t PTR_BUCKET_NR(struct cache_set *c,

				   const struct bkey *k,

				   unsigned int ptr)
@@ -822,7 +815,7 @@ static inline struct bucket *PTR_BUCKET(struct cache_set *c, 
					const struct bkey *k,

					unsigned int ptr)

{

	return PTR_CACHE(c, k, ptr)->buckets + PTR_BUCKET_NR(c, k, ptr);

	return c->cache->buckets + PTR_BUCKET_NR(c, k, ptr);

}



static inline uint8_t gen_after(uint8_t a, uint8_t b)
@@ -841,7 +834,7 @@ static inline uint8_t ptr_stale(struct cache_set *c, const struct bkey *k, 
static inline bool ptr_available(struct cache_set *c, const struct bkey *k,

				 unsigned int i)

{

	return (PTR_DEV(k, i) < MAX_CACHES_PER_SET) && PTR_CACHE(c, k, i);

	return (PTR_DEV(k, i) < MAX_CACHES_PER_SET) && c->cache;

}



/* Btree key macros */

drivers/md/bcache/btree.c

+2 −2
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void __bch_btree_node_write(struct btree *b, struct closure *parent) 
	do_btree_node_write(b);



	atomic_long_add(set_blocks(i, block_bytes(b->c->cache)) * b->c->cache->sb.block_size,

			&PTR_CACHE(b->c, &b->key, 0)->btree_sectors_written);

			&b->c->cache->btree_sectors_written);



	b->written += set_blocks(i, block_bytes(b->c->cache));

}
@@ -1161,7 +1161,7 @@ static void make_btree_freeing_key(struct btree *b, struct bkey *k) 


	for (i = 0; i < KEY_PTRS(k); i++)

		SET_PTR_GEN(k, i,

			    bch_inc_gen(PTR_CACHE(b->c, &b->key, i),

			    bch_inc_gen(b->c->cache,

					PTR_BUCKET(b->c, &b->key, i)));



	mutex_unlock(&b->c->bucket_lock);

drivers/md/bcache/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void bch_btree_verify(struct btree *b) 
	v->keys.ops = b->keys.ops;



	bio = bch_bbio_alloc(b->c);

	bio_set_dev(bio, PTR_CACHE(b->c, &b->key, 0)->bdev);

	bio_set_dev(bio, c->cache->bdev);

	bio->bi_iter.bi_sector	= PTR_OFFSET(&b->key, 0);

	bio->bi_iter.bi_size	= KEY_SIZE(&v->key) << 9;

	bio->bi_opf		= REQ_OP_READ | REQ_META;

drivers/md/bcache/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static bool __ptr_invalid(struct cache_set *c, const struct bkey *k) 


	for (i = 0; i < KEY_PTRS(k); i++)

		if (ptr_available(c, k, i)) {

			struct cache *ca = PTR_CACHE(c, k, i);

			struct cache *ca = c->cache;

			size_t bucket = PTR_BUCKET_NR(c, k, i);

			size_t r = bucket_remainder(c, PTR_OFFSET(k, i));
@@ -71,7 +71,7 @@ static const char *bch_ptr_status(struct cache_set *c, const struct bkey *k) 


	for (i = 0; i < KEY_PTRS(k); i++)

		if (ptr_available(c, k, i)) {

			struct cache *ca = PTR_CACHE(c, k, i);

			struct cache *ca = c->cache;

			size_t bucket = PTR_BUCKET_NR(c, k, i);

			size_t r = bucket_remainder(c, PTR_OFFSET(k, i));