From: colyli@suse.de
To: linux-bcache@vger.kernel.org
Cc: linux-block@vger.kernel.org, Coly Li <colyli@suse.de>
Subject: [PATCH v1 08/14] bcache: only use bucket_bytes() on struct cache
Date: Sat, 15 Aug 2020 20:47:37 +0800 [thread overview]
Message-ID: <20200815124743.115270-9-colyli@suse.de> (raw)
In-Reply-To: <20200815124743.115270-1-colyli@suse.de>
From: Coly Li <colyli@suse.de>
Because struct cache_set and struct cache both have struct cache_sb,
macro bucket_bytes() currently are used on both of them. When removing
the embedded struct cache_sb from struct cache_set, this macro won't be
used on struct cache_set anymore.
This patch unifies all bucket_bytes() usage only on struct cache, this is
one of the preparation to remove the embedded struct cache_sb from
struct cache_set.
Signed-off-by: Coly Li <colyli@suse.de>
---
drivers/md/bcache/bcache.h | 2 +-
drivers/md/bcache/sysfs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index 48a2585b6bbb..94d4baf4c405 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -757,7 +757,7 @@ struct bbio {
#define btree_default_blocks(c) \
((unsigned int) ((PAGE_SECTORS * (c)->btree_pages) >> (c)->block_bits))
-#define bucket_bytes(c) ((c)->sb.bucket_size << 9)
+#define bucket_bytes(ca) ((ca)->sb.bucket_size << 9)
#define block_bytes(ca) ((ca)->sb.block_size << 9)
static inline unsigned int meta_bucket_pages(struct cache_sb *sb)
diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
index b9f524ab5cc8..4bfe98faadcc 100644
--- a/drivers/md/bcache/sysfs.c
+++ b/drivers/md/bcache/sysfs.c
@@ -713,7 +713,7 @@ SHOW(__bch_cache_set)
sysfs_print(synchronous, CACHE_SYNC(&c->sb));
sysfs_print(journal_delay_ms, c->journal_delay_ms);
- sysfs_hprint(bucket_size, bucket_bytes(c));
+ sysfs_hprint(bucket_size, bucket_bytes(c->cache));
sysfs_hprint(block_size, block_bytes(c->cache));
sysfs_print(tree_depth, c->root->level);
sysfs_print(root_usage_percent, bch_root_usage(c));
--
2.26.2
next prev parent reply other threads:[~2020-08-15 22:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 12:47 [PATCH 00/14] bcache: remove multiple caches code framework colyli
2020-08-15 12:47 ` [PATCH v1 01/14] bcache: remove 'int n' from parameter list of bch_bucket_alloc_set() colyli
2020-08-15 12:47 ` [PATCH v1 02/14] bcache: explicitly make cache_set only have single cache colyli
2020-08-15 12:47 ` [PATCH v1 03/14] bcache: remove for_each_cache() colyli
2020-08-15 12:47 ` [PATCH v1 04/14] bcache: add set_uuid in struct cache_set colyli
2020-08-15 12:47 ` [PATCH v1 05/14] bcache: only use block_bytes() on struct cache colyli
2020-08-15 12:47 ` [PATCH v1 06/14] bcache: remove useless alloc_bucket_pages() colyli
2020-08-15 12:47 ` [PATCH v1 07/14] bcache: remove useless bucket_pages() colyli
2020-08-15 12:47 ` colyli [this message]
2020-08-15 12:47 ` [PATCH v1 09/14] bcache: avoid data copy between cache_set->sb and cache->sb colyli
2020-08-15 12:47 ` [PATCH v1 10/14] bcache: don't check seq numbers in register_cache_set() colyli
2020-08-15 12:47 ` [PATCH v1 11/14] bcache: remove can_attach_cache() colyli
2020-08-15 12:47 ` [PATCH v1 12/14] bcache: check and set sync status on cache's in-memory super block colyli
2020-08-15 12:47 ` [PATCH v1 13/14] bcache: remove embedded struct cache_sb from struct cache_set colyli
2020-08-15 12:47 ` [PATCH v1 14/14] bcache: move struct cache_sb out of uapi bcache.h colyli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200815124743.115270-9-colyli@suse.de \
--to=colyli@suse.de \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox