bcache: remove can_attach_cache()
authorColy Li <colyli@suse.de>
Thu, 1 Oct 2020 06:50:54 +0000 (14:50 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 2 Oct 2020 20:25:30 +0000 (14:25 -0600)
After removing the embedded struct cache_sb from struct cache_set, cache
set will directly reference the in-memory super block of struct cache.
It is unnecessary to compare block_size, bucket_size and nr_in_set from
the identical in-memory super block in can_attach_cache().

This is a preparation patch for latter removing cache_set->sb from
struct cache_set.

Signed-off-by: Coly Li <colyli@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/bcache/super.c

index 291a3d4..1450c06 100644 (file)
@@ -2127,13 +2127,6 @@ err:
        return -EIO;
 }
 
-static bool can_attach_cache(struct cache *ca, struct cache_set *c)
-{
-       return ca->sb.block_size        == c->sb.block_size &&
-               ca->sb.bucket_size      == c->sb.bucket_size &&
-               ca->sb.nr_in_set        == c->sb.nr_in_set;
-}
-
 static const char *register_cache_set(struct cache *ca)
 {
        char buf[12];
@@ -2145,9 +2138,6 @@ static const char *register_cache_set(struct cache *ca)
                        if (c->cache)
                                return "duplicate cache set member";
 
-                       if (!can_attach_cache(ca, c))
-                               return "cache sb does not match set";
-
                        if (!CACHE_SYNC(&ca->sb))
                                SET_CACHE_SYNC(&c->sb, false);