diff options
| author | David Sterba <dsterba@suse.cz> | 2015-02-02 15:51:15 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-04-07 19:20:17 +0200 |
| commit | a297698edce56d13628411203c7c9287c78ec990 (patch) | |
| tree | 63ed24c1f6c0e79144b88af8ecc44b42af14ed0c /btrfs-convert.c | |
| parent | 445ed1f11ce3c49c6ac180e90dcff569757c56dc (diff) | |
| download | btrfs-progs-a297698edce56d13628411203c7c9287c78ec990.tar.gz | |
btrfs-progs: mkfs, deprecate leafsize and clean up the code
Using the --leafsize will issue a warning. Replace leafsize with
nodesize in the mkfs-related code.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'btrfs-convert.c')
| -rw-r--r-- | btrfs-convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index b176f7b..c7ff828 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2298,7 +2298,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_node_or_leaf_size(nodesize, blocksize)) + if (btrfs_check_nodesize(nodesize, blocksize)) goto fail; blocks_per_node = nodesize / blocksize; ret = -blocks_per_node; @@ -2322,7 +2322,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt goto fail; } ret = make_btrfs(fd, devname, ext2_fs->super->s_volume_name, - NULL, blocks, total_bytes, nodesize, nodesize, + NULL, blocks, total_bytes, nodesize, blocksize, blocksize, 0); if (ret) { fprintf(stderr, "unable to create initial ctree: %s\n", |