Skip to content

Commit 4c76a5e

Browse files
adam900710boryas
authored andcommitted
btrfs: remove 2K block size support
Originally 2K block size support was introduced to test subpage (block size < page size) on x86_64 where the page size is exactly the original minimal block size. However that 2K block size support has some problems: - No 2K nodesize support This is critical, as there is still no way to exercise the subpage metadata routine. - Very easy to test subpage data path now With the currently experimental large folio support, it's very easy to test the subpage data folio path already, as when a folio larger than 4K is encountered on x86_64, we will need all the subpage folio states and bitmaps. So there is no need to use 2K block size just to verify subpage data path even on x86_64. And with the incoming huge folio (2M on x86_64) support, the 2K block size will easily double the bitmap size, considering the burden to maintain and the limited extra coverage, I believe it's time to remove it for the incoming huge folio support. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 27aec2e commit 4c76a5e

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

fs/btrfs/fs.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,8 @@ struct btrfs_subpage_info;
5050
struct btrfs_stripe_hash_table;
5151
struct btrfs_space_info;
5252

53-
/*
54-
* Minimum data and metadata block size.
55-
*
56-
* Normally it's 4K, but for testing subpage block size on 4K page systems, we
57-
* allow DEBUG builds to accept 2K page size.
58-
*/
59-
#ifdef CONFIG_BTRFS_DEBUG
60-
#define BTRFS_MIN_BLOCKSIZE (SZ_2K)
61-
#else
53+
/* Minimum data and metadata block size. */
6254
#define BTRFS_MIN_BLOCKSIZE (SZ_4K)
63-
#endif
64-
6555
#define BTRFS_MAX_BLOCKSIZE (SZ_64K)
6656

6757
#define BTRFS_MAX_EXTENT_SIZE SZ_128M

0 commit comments

Comments
 (0)