projects
/
lwext4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ext4_mkfs: Added UUID parameter to create new filesystems with non-zero UUID
[lwext4.git]
/
src
/
ext4_mkfs.c
diff --git
a/src/ext4_mkfs.c
b/src/ext4_mkfs.c
index 594205526bb3074776e00ad0668d1f2dcdb5a0d6..355b20a22d733959c2df4220178d6de61509bedd 100644
(file)
--- a/
src/ext4_mkfs.c
+++ b/
src/ext4_mkfs.c
@@
-95,6
+95,7
@@
static int sb2info(struct ext4_sblock *sb, struct ext4_mkfs_info *info)
info->label = sb->volume_name;
info->len = (uint64_t)info->block_size * ext4_sb_get_blocks_cnt(sb);
info->dsc_size = to_le16(sb->desc_size);
info->label = sb->volume_name;
info->len = (uint64_t)info->block_size * ext4_sb_get_blocks_cnt(sb);
info->dsc_size = to_le16(sb->desc_size);
+ memcpy(info->uuid, sb->uuid, UUID_SIZE);
return EOK;
}
return EOK;
}
@@
-260,7
+261,7
@@
static void fill_sb(struct fs_aux_info *aux_info, struct ext4_mkfs_info *info)
sb->features_incompatible = to_le32(info->feat_incompat);
sb->features_read_only = to_le32(info->feat_ro_compat);
sb->features_incompatible = to_le32(info->feat_incompat);
sb->features_read_only = to_le32(info->feat_ro_compat);
- mem
set(sb->uuid, 0, sizeof(sb->uuid)
);
+ mem
cpy(sb->uuid, info->uuid, UUID_SIZE
);
memset(sb->volume_name, 0, sizeof(sb->volume_name));
strncpy(sb->volume_name, info->label, sizeof(sb->volume_name));
memset(sb->volume_name, 0, sizeof(sb->volume_name));
strncpy(sb->volume_name, info->label, sizeof(sb->volume_name));