marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: limit the max value of leafsize and nodesize 

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 leafsize and nodesize are equal at present, so we just use one function
"check_leaf_or_node_size" to limit leaf and node size below BTRFS_MAX_METADATA_BLOCKSIZE.

Signed-off-by: Robin Dong <sanbai@taobao.com>
Reviewed-by: David Sterba <dave@jikos.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
master
Robin Dong 2012-09-27 21:02:39 -06:00 committed by root
parent 29db8b12cd
commit 32be2a1164
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctree.h
View File

@ -110,6 +110,12 @@ struct btrfs_trans_handle;
*/
#define BTRFS_DEV_ITEMS_OBJECTID 1ULL
/*
* the max metadata block size. This limit is somewhat artificial,
* but the memmove costs go through the roof for larger blocks.
*/
#define BTRFS_MAX_METADATA_BLOCKSIZE 65536
/*
* we can actually store much bigger names, but lets not confuse the rest
* of linux

29
mkfs.c
View File

@ -1201,6 +1201,27 @@ static int zero_output_file(int out_fd, u64 size, u32 sectorsize)
return ret;
}
static int check_leaf_or_node_size(u32 size, u32 sectorsize)
{
if (size < sectorsize) {
fprintf(stderr,
"Illegal leafsize (or nodesize) %u (smaller than %u)\n",
size, sectorsize);
return -1;
} else if (size > BTRFS_MAX_METADATA_BLOCKSIZE) {
fprintf(stderr,
"Illegal leafsize (or nodesize) %u (larger than %u)\n",
size, BTRFS_MAX_METADATA_BLOCKSIZE);
return -1;
} else if (size & (sectorsize - 1)) {
fprintf(stderr,
"Illegal leafsize (or nodesize) %u (not align to %u)\n",
size, sectorsize);
return -1;
}
return 0;
}
int main(int ac, char **av)
{
char *file;
@ -1291,14 +1312,10 @@ int main(int ac, char **av)
}
}
sectorsize = max(sectorsize, (u32)getpagesize());
if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
fprintf(stderr, "Illegal leafsize %u\n", leafsize);
if (check_leaf_or_node_size(leafsize, sectorsize))
exit(1);
}
if (nodesize < sectorsize || (nodesize & (sectorsize - 1))) {
fprintf(stderr, "Illegal nodesize %u\n", nodesize);
if (check_leaf_or_node_size(nodesize, sectorsize))
exit(1);
}
ac = ac - optind;
if (ac == 0)
print_usage();