Revision b16671e8f493e3df40b1fb0dff4078f391c5099a authored by Coly Li on 04 January 2021, 07:41:21 UTC, committed by Jens Axboe on 09 January 2021, 16:21:03 UTC
When large bucket feature was added, BCH_FEATURE_INCOMPAT_LARGE_BUCKET
was introduced into the incompat feature set. It used bucket_size_hi
(which was added at the tail of struct cache_sb_disk) to extend current
16bit bucket size to 32bit with existing bucket_size in struct
cache_sb_disk.

This is not a good idea, there are two obvious problems,
- Bucket size is always value power of 2, if store log2(bucket size) in
  existing bucket_size of struct cache_sb_disk, it is unnecessary to add
  bucket_size_hi.
- Macro csum_set() assumes d[SB_JOURNAL_BUCKETS] is the last member in
  struct cache_sb_disk, bucket_size_hi was added after d[] which makes
  csum_set calculate an unexpected super block checksum.

To fix the above problems, this patch introduces a new incompat feature
bit BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE, when this bit is set, it
means bucket_size in struct cache_sb_disk stores the order of power-of-2
bucket size value. When user specifies a bucket size larger than 32768
sectors, BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE will be set to
incompat feature set, and bucket_size stores log2(bucket size) more
than store the real bucket size value.

The obsoleted BCH_FEATURE_INCOMPAT_LARGE_BUCKET won't be used anymore,
it is renamed to BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET and still only
recognized by kernel driver for legacy compatible purpose. The previous
bucket_size_hi is renmaed to obso_bucket_size_hi in struct cache_sb_disk
and not used in bcache-tools anymore.

For cache device created with BCH_FEATURE_INCOMPAT_LARGE_BUCKET feature,
bcache-tools and kernel driver still recognize the feature string and
display it as "obso_large_bucket".

With this change, the unnecessary extra space extend of bcache on-disk
super block can be avoided, and csum_set() may generate expected check
sum as well.

Fixes: ffa470327572 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket")
Signed-off-by: Coly Li <colyli@suse.de>
Cc: stable@vger.kernel.org # 5.9+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 1dfc068
History
File Mode Size
Kconfig -rw-r--r-- 665 bytes
Makefile -rw-r--r-- 288 bytes
balloc.c -rw-r--r-- 18.4 KB
dir.c -rw-r--r-- 5.2 KB
directory.c -rw-r--r-- 5.8 KB
ecma_167.h -rw-r--r-- 21.7 KB
file.c -rw-r--r-- 7.3 KB
ialloc.c -rw-r--r-- 3.5 KB
inode.c -rw-r--r-- 67.0 KB
lowlevel.c -rw-r--r-- 1.5 KB
misc.c -rw-r--r-- 7.7 KB
namei.c -rw-r--r-- 33.9 KB
osta_udf.h -rw-r--r-- 9.0 KB
partition.c -rw-r--r-- 8.7 KB
super.c -rw-r--r-- 67.4 KB
symlink.c -rw-r--r-- 4.2 KB
truncate.c -rw-r--r-- 7.9 KB
udf_i.h -rw-r--r-- 1.8 KB
udf_sb.h -rw-r--r-- 4.1 KB
udfdecl.h -rw-r--r-- 8.8 KB
udfend.h -rw-r--r-- 1.6 KB
udftime.c -rw-r--r-- 3.2 KB
unicode.c -rw-r--r-- 9.2 KB

back to top