From 1a6f1cb937a4357f22a7947b333aa3d6faa3b78e Mon Sep 17 00:00:00 2001
From: threedeyes <3dEyes@gmail.com>
Date: Wed, 14 Nov 2012 03:27:49 +0000
Subject: [PATCH] NTFS: Fix an issue when fs_initialization re-calling.

* Reset global variables for mkntfs module.
* Add error handling for mkntfs call.
---
 .../kernel/file_systems/ntfs/fs_func.c        |  7 ++--
 .../kernel/file_systems/ntfs/utils/mkntfs.c   | 39 ++++++++++++++++---
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/ntfs/fs_func.c b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
index 2916761f4f..b7ee6ead0d 100644
--- a/src/add-ons/kernel/file_systems/ntfs/fs_func.c
+++ b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
@@ -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)
diff --git a/src/add-ons/kernel/file_systems/ntfs/utils/mkntfs.c b/src/add-ons/kernel/file_systems/ntfs/utils/mkntfs.c
index 6c4e4f2cb6..3b9ed362fa 100644
--- a/src/add-ons/kernel/file_systems/ntfs/utils/mkntfs.c
+++ b/src/add-ons/kernel/file_systems/ntfs/utils/mkntfs.c
@@ -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);
 }
+