From ece0e1ea036e6d1c952f304ff74762a12786c37f Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Fri, 25 Sep 2015 18:15:44 +0200 Subject: btrfs-progs: utils: Check nodesize against features Check nodesize against features, not only sectorsize. In fact, one of the btrfs-convert and mkfs differs in the nodesize check. This patch also provides the basis for later btrfs-convert fix. Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- btrfs-convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'btrfs-convert.c') diff --git a/btrfs-convert.c b/btrfs-convert.c index e7f3c9e1..802930c9 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2319,7 +2319,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt fprintf(stderr, "filetype feature is missing\n"); goto fail; } - if (btrfs_check_nodesize(nodesize, blocksize)) + if (btrfs_check_nodesize(nodesize, blocksize, features)) goto fail; blocks_per_node = nodesize / blocksize; ret = -blocks_per_node; -- cgit v1.2.3