i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTFS: Fix an issue when fs_initialization re-calling.

Browse Source 
* Reset global variables for mkntfs module.
* Add error handling for mkntfs call.
This commit is contained in:
threedeyes
2012-11-14 03:34:25 +00:00
parent bcb081f0fe
commit 1a6f1cb937
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/fs_func.c
+4 -3
View File
@@ -321,10 +321,11 @@ fs_initialize(int fd, partition_id partitionID, const char* name,
update_disk_device_job_progress(job, 0);
if (ioctl(fd, B_GET_PATH_FOR_DEVICE, devpath) != 0) {
mkntfs_main(devpath, name);
} else {
result = mkntfs_main(devpath, name);
if (result != 0)
return result;
} else
return B_BAD_VALUE;
}
result = scan_partition(partitionID);
if (result != B_OK)
src/add-ons/kernel/file_systems/ntfs/utils/mkntfs.c
+33 -6
View File
@@ -4768,14 +4768,41 @@ done:
* mkntfs_main
*/
int mkntfs_main(const char *devpath, const char *label)
{
{
//reset global variables
g_buf = NULL;
g_mft_bitmap_byte_size = 0;
g_mft_bitmap = NULL;
g_lcn_bitmap_byte_size = 0;
g_dynamic_buf_size = 0;
g_dynamic_buf = NULL;
g_rl_mft = NULL;
g_rl_mft_bmp = NULL;
g_rl_mftmirr = NULL;
g_rl_logfile = NULL;
g_rl_boot = NULL;
g_rl_bad = NULL;
g_index_block = NULL;
g_vol = NULL;
g_mft_size = 0;
g_mft_lcn = 0;
g_mftmirr_lcn = 0;
g_logfile_lcn = 0;
g_logfile_size = 0;
g_mft_zone_end = 0;
g_num_bad_blocks = 0;
g_bad_blocks = NULL;
g_allocation = NULL;
//init default options
mkntfs_init_options(&opts);
opts.dev_name = (char*)devpath;
opts.label = (char*)label;
opts.dev_name = devpath;
opts.label = label;
opts.force = TRUE;
opts.quick_format = TRUE;
return mkntfs_redirect(&opts);
}