summaryrefslogtreecommitdiff
path: root/btrfs-convert.c
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2016-09-22 14:47:57 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2016-09-22 14:47:57 +0100
commitc92ba05933a640c0084321bc6eeaa091c283b8bb (patch)
tree72cdcdec5d50586a244ba8743356d3fd2ecb1b4c /btrfs-convert.c
parent249a3592d5dfdec0e52b5e9e712339364ea758ed (diff)
New upstream release.
Diffstat (limited to 'btrfs-convert.c')
-rw-r--r--btrfs-convert.c6
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) {