summaryrefslogtreecommitdiff
path: root/ext4_utils/make_ext4fs.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-23 13:08:16 -0800
committerColin Cross <ccross@android.com>2014-01-23 13:25:25 -0800
commit782879ab61fe825835a9c6a701f91aa7d305acef (patch)
tree68ec6a8cfd1c29b2b73283d2506d115fc685fbc6 /ext4_utils/make_ext4fs.c
parent7900c773815d062deb266f744f95aa76b3573fa3 (diff)
downloadextras-782879ab61fe825835a9c6a701f91aa7d305acef.tar.gz
ext4_utils: move sparse file pointer out of fs_info
Move the sparse file pointer out of the fs_info struct in preparation for exporting fs_info without sparse file support. Change-Id: I5a72147fe4fb24296e615cb82dbba91c6dc6f7f0
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
-rw-r--r--ext4_utils/make_ext4fs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index c2a26653..2250241c 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -362,9 +362,9 @@ void reset_ext4fs_info() {
memset(&info, 0, sizeof(info));
memset(&aux_info, 0, sizeof(aux_info));
- if (info.sparse_file) {
- sparse_file_destroy(info.sparse_file);
- info.sparse_file = NULL;
+ if (ext4_sparse_file) {
+ sparse_file_destroy(ext4_sparse_file);
+ ext4_sparse_file = NULL;
}
}
@@ -545,7 +545,7 @@ int make_ext4fs_internal(int fd, const char *_directory,
printf(" Block groups: %d\n", aux_info.groups);
printf(" Reserved block group size: %d\n", info.bg_desc_reserve_blocks);
- info.sparse_file = sparse_file_new(info.block_size, info.len);
+ ext4_sparse_file = sparse_file_new(info.block_size, info.len);
block_allocator_init();
@@ -607,8 +607,8 @@ int make_ext4fs_internal(int fd, const char *_directory,
write_ext4_image(fd, gzip, sparse, crc);
- sparse_file_destroy(info.sparse_file);
- info.sparse_file = NULL;
+ sparse_file_destroy(ext4_sparse_file);
+ ext4_sparse_file = NULL;
free(mountpoint);
free(directory);