Re: [PATCH 1/2] btrfs-progs: limit the max value of leafsize and nodesize
From: David Sterba <hidden>
Date: 2012-09-27 08:54:24
On Wed, Sep 26, 2012 at 03:52:07PM +0800, Robin Dong wrote:
Using mkfs.btrfs like: mkfs.btrfs -l 131072 /dev/sda will return no error, but after mount it, the dmesg will report: BTRFS: couldn't mount because metadata blocksize (131072) was too large The user tools should use BTRFS_MAX_METADATA_BLOCKSIZE to limit leaf and node size.
Good catch.
quoted hunk ↗ jump to hunk
@@ -1291,11 +1291,13 @@ int main(int ac, char **av) } } sectorsize = max(sectorsize, (u32)getpagesize()); - if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) { + if (leafsize < sectorsize || leafsize > BTRFS_MAX_METADATA_BLOCKSIZE || + (leafsize & (sectorsize - 1))) {
Could you please separate the BTRFS_MAX_METADATA_BLOCKSIZE check and add appropriate error message that actually informs the user what kind of error happened?
fprintf(stderr, "Illegal leafsize %u\n", leafsize);
exit(1);
}
- if (nodesize < sectorsize || (nodesize & (sectorsize - 1))) {
+ if (nodesize < sectorsize || nodesize > BTRFS_MAX_METADATA_BLOCKSIZE ||
+ (nodesize & (sectorsize - 1))) {(same here)
fprintf(stderr, "Illegal nodesize %u\n", nodesize); exit(1); }
Thanks! david