NTFS: Final tidyups of docs, a typo in a deprecated mount option and

version change to 2.0.0, removing the TNG from the name. We want to enter
the kernel now so no need for TNG in the name and the higher major version
number sets off the new driver clearly away from the old driver.

Documentation/filesystems/ntfs.txt

@@ -14,6 +14,9 @@ number of sectors.
 Supported mount options
 =======================
 
+iocharset=name		Deprecated option. Still supported but please use
+			nls=name in the future. See description for nls=name.
+
 nls=name		Character set to use when returning file names.
 			Unlike VFAT, NTFS suppresses names that contain
 			unconvertible characters. Note that most character
@@ -23,6 +26,11 @@ nls=name		Character set to use when returning file names.
 			to use nls=utf8 which is capable of representing all
 			Unicode characters.
 
+utf8=<bool>		Option no longer supported. Currently mapped to
+			nls=utf8 but please use nls=utf8 in the future and
+			make sure utf8 is compiled either as module or into
+			the kernel. See description for nls=name.
+
 uid=
 gid=
 umask=			Provide default owner, group, and access mode mask.
@@ -39,21 +47,13 @@ sloppy=<BOOL>		If sloppy is specified, ignore unknown mount options.
 			Otherwise the default behaviour is to abort mount if
 			any unknown options are found.
 
-errors=opt		What to do when critical file system errors are found.
-			Following values can be used for "opt":
-			  continue: DEFAULT, try to clean-up as much as
-				    possible, e.g. marking a corrupt inode as
-				    bad so it is no longer accessed, and then
-				    continue.
-			  recover:  At present only supported is recovery of
-				    the boot sector from the backup copy. If a
-				    read-only mount, the recovery is done in
-				    memory only and not written to disk.
-			Note that the options are additive, i.e. specifying:
-			   errors=continue,errors=recover
-			This means the driver will attempt to recover and if
-			that fails it will clean-up as much as possible and
-			continue.
+posix=<bool>		Deprecated option. Still supported but please use
+			show_inodes=posix in the future. See description for
+			show_inodes=opt.
+
+show_sys_files=<bool>	Deprecated option. Still supported but please use
+			show_inodes=system in the future. See description for
+			show_inodes=opt.
 
 show_inodes=opt		Allows choice of which types of inode names readdir()
 			returns, i.e. this affects what "ls" shows. Following
@@ -94,6 +94,22 @@ show_inodes=opt		Allows choice of which types of inode names readdir()
 			names are case sensitive and they can only be accessed
 			given the correct case.
 
+errors=opt		What to do when critical file system errors are found.
+			Following values can be used for "opt":
+			  continue: DEFAULT, try to clean-up as much as
+				    possible, e.g. marking a corrupt inode as
+				    bad so it is no longer accessed, and then
+				    continue.
+			  recover:  At present only supported is recovery of
+				    the boot sector from the backup copy. If a
+				    read-only mount, the recovery is done in
+				    memory only and not written to disk.
+			Note that the options are additive, i.e. specifying:
+			   errors=continue,errors=recover
+			This means the driver will attempt to recover and if
+			that fails it will clean-up as much as possible and
+			continue.
+
 mft_zone_multiplier=	Set the MFT zone multiplier for the volume (this
 			setting is not persistent across mounts and can be
 			changed from mount to mount but cannot be changed on
@@ -117,8 +133,17 @@ mft_zone_multiplier=	Set the MFT zone multiplier for the volume (this
 Features
 ========
 
-- Implementation of NTFS read support functionally equivalent to the old ntfs
-  driver.
+- This is a complete rewrite of the NTFS driver that used to be in the kernel.
+  This new driver implementats NTFS read support and is functionally equivalent
+  to the old ntfs driver. And in addition the new driver has full support for
+  sparse files on NTFS 3.x volumes which the old driver isn't happy with.
+- A comparison of the two drivers using:
+	time find . -type f -exec md5sum "{}" \;
+  run three times in sequence with each driver (after a reboot) on a 1.4GiB
+  NTFS partition, showed the new driver to be 20% faster in total time elapsed
+  (from 9:43 minutes on average down to 7:53). The time spent in user space
+  was unchanged but the time spent in the kernel was decreased by a factor of
+  2.5 (from 85 CPU seconds down to 33).
 
 Known bugs and (mis-)features
 =============================
@@ -133,6 +158,6 @@ ChangeLog
 
 Note that a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
-TNG-0.0.8:
+2.0.0:
 	- Started ChangeLog.
 

fs/ntfs/ChangeLog

@@ -27,7 +27,7 @@ ToDo:
 	  quite big. Modularising them a bit, e.g. a-la get_block(), will make
 	  them cleaner and make code reuse easier.
 
-tng-0.0.9 - Work in progress
+2.0.0 - New version number. Remove TNG from the name. Now in the kernel.
 
 	- Add kill_super, just keeping up with the vfs changes in the kernel.
 	- Repeat some changes from tng-0.0.8 that somehow got lost on the way
@@ -41,6 +41,7 @@ tng-0.0.9 - Work in progress
 	  clean up compress.c a little, removing some uncommented/unused debug
 	  code.
 	- Tidy up dir.c a little bit.
+	- Don't bother getting the run list in inode.c::ntfs_read_inode().
 	- Merge mft.c::ntfs_mft_readpage() and aops.c::ntfs_index_readpage()
 	  creating aops.c::ntfs_mst_readpage(), improving the handling of
 	  holes and overflow in the process and implementing the correct
@@ -58,8 +59,9 @@ tng-0.0.9 - Work in progress
 	- Complete implementation of proper handling of allocated_size vs
 	  initialized_size vs data_size (i.e. i_size) in whole driver.
 	  Basically aops.c is now completely rewritten.
-
-- Don't bother getting the run list in inode.c::ntfs_read_inode().
+	- Change NTFS driver name to just NTFS and set version number to 2.0.0
+	  to make a clear distinction from the old driver which is still on
+	  version 1.1.22.
 
 tng-0.0.8 - 08/03/2002 - Now using BitKeeper, http://linux-ntfs.bkbits.net/
 

fs/ntfs/Makefile

-# Rules for making the NTFS TNG driver.
+# Rules for making the NTFS driver.
 
 O_TARGET := ntfs.o
 
@@ -7,7 +7,7 @@ obj-y   := time.o unistr.o inode.o file.o mft.o super.o debug.o aops.o \
 
 obj-m   := $(O_TARGET)
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"TNG-0.0.9-WIP\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.0.0\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG

fs/ntfs/super.c

@@ -152,9 +152,9 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
 				on_errors_arr)
 		else NTFS_GETOPT_OPTIONS_ARRAY("show_inodes", readdir_opts,
 				readdir_opts_arr)
-		else if (!strcmp(p, "show_system_files")) {
+		else if (!strcmp(p, "show_sys_files")) {
 			BOOL val = FALSE;
-			ntfs_warning(vol->sb, "Option show_system_files is "
+			ntfs_warning(vol->sb, "Option show_sys_files is "
 				   "deprecated. Please use option "
 				   "show_inodes=system in the future.");
 			if (!v || !*v)