diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2015-09-25 18:15:44 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-10-02 17:54:04 +0200 |
| commit | ece0e1ea036e6d1c952f304ff74762a12786c37f (patch) | |
| tree | bba6fb117552bb74b000b84e9de7deb85bde5cc4 /btrfs-convert.c | |
| parent | 94789777b9e8f350ba815b07baa5383e99cd1944 (diff) | |
| download | btrfs-progs-ece0e1ea036e6d1c952f304ff74762a12786c37f.tar.gz | |
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 <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs-convert.c')
| -rw-r--r-- | btrfs-convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index e7f3c9e..802930c 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; |