From a297698edce56d13628411203c7c9287c78ec990 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 2 Feb 2015 15:51:15 +0100 Subject: 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 --- btrfs-convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'btrfs-convert.c') diff --git a/btrfs-convert.c b/btrfs-convert.c index b176f7b6..c7ff8280 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", -- cgit v1.2.3