diff options
| author | David Sterba <dsterba@suse.com> | 2016-08-31 19:38:31 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-09-21 13:44:24 +0200 |
| commit | 7aaa1a92f621eec59a4ef834afefd831915a3521 (patch) | |
| tree | 3fa23165d53ebdaad1cc71200f01e9c37295ac26 /btrfs-convert.c | |
| parent | 90e3e630c2f641f3ceca32672e8e3a8ac0ceae8a (diff) | |
btrfs-progs: mkfs: use preallocated buffers for config uuids
No need for dynamic allocation, the buffers are small, remove the
now-useless error conditions.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs-convert.c')
| -rw-r--r-- | btrfs-convert.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index c10dc172..5175f1f7 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2373,10 +2373,8 @@ static int do_convert(const char *devname, int datacsum, int packing, mkfs_cfg.stripesize = blocksize; mkfs_cfg.features = features; /* New convert need these space */ - mkfs_cfg.fs_uuid = malloc(BTRFS_UUID_UNPARSED_SIZE); - mkfs_cfg.chunk_uuid = malloc(BTRFS_UUID_UNPARSED_SIZE); - *(mkfs_cfg.fs_uuid) = '\0'; - *(mkfs_cfg.chunk_uuid) = '\0'; + memset(mkfs_cfg.chunk_uuid, 0, BTRFS_UUID_UNPARSED_SIZE); + memset(mkfs_cfg.fs_uuid, 0, BTRFS_UUID_UNPARSED_SIZE); ret = make_btrfs(fd, &mkfs_cfg, &cctx); if (ret) { |