diff -Nur linux/CREDITS linux-2.4.18-ntfs-2.0.6a/CREDITS
--- linux/CREDITS	Mon Apr 29 21:50:17 2002
+++ linux-2.4.18-ntfs-2.0.6a/CREDITS	Mon May  6 23:18:13 2002
@@ -63,10 +63,9 @@
 S: Belgium
 
 N: Anton Altaparmakov
-E: aia21@cus.cam.ac.uk
+E: aia21@cantab.net
 W: http://www-stu.christs.cam.ac.uk/~aia21/
-D: NTFS driver maintainer. NTFS fixes and cleanup.
-D: Tiny fixes in linear md device and emu10k1 driver.
+D: Author of new NTFS driver, various other kernel hacks.
 S: Christ's College
 S: Cambridge CB2 3BU
 S: United Kingdom
diff -Nur linux/Documentation/Configure.help linux-2.4.18-ntfs-2.0.6a/Documentation/Configure.help
--- linux/Documentation/Configure.help	Mon Apr 29 21:50:17 2002
+++ linux-2.4.18-ntfs-2.0.6a/Documentation/Configure.help	Mon May  6 23:17:55 2002
@@ -14552,34 +14552,33 @@
 
 NTFS file system support (read-only)
 CONFIG_NTFS_FS
-  NTFS is the file system of Microsoft Windows NT. Say Y if you want
-  to get read access to files on NTFS partitions of your hard drive.
-  The Linux NTFS driver supports most of the mount options of the VFAT
-  driver, see <file:Documentation/filesystems/ntfs.txt>. Saying Y here
-  will give you read-only access to NTFS partitions.
+  NTFS is the file system of Microsoft Windows NT/2000/XP. For more
+  information see <file:Documentation/filesystems/ntfs.txt>. Saying Y
+  here would allow you to read from NTFS partitions.
 
-  This code is also available as a module ( = code which can be
+  This file system is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called ntfs.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-NTFS write support (DANGEROUS)
-CONFIG_NTFS_RW
-  If you say Y here, you will (maybe) be able to write to NTFS file
-  systems as well as read from them. The read-write support in NTFS
-  is far from being complete and is not well tested. If you say Y
-  here, back up your NTFS volume first, since it will probably get
-  damaged. Also, download the Linux-NTFS project distribution from
-  Sourceforge at <http://linux-ntfs.sf.net/> and always run the
-  included ntfsfix utility after writing to an NTFS partition from
-  Linux to fix some of the damage done by the driver. You should run
-  ntfsfix _after_ unmounting the partition in Linux but _before_
-  rebooting into Windows. When Windows next boots, chkdsk will be
-  run automatically to fix the remaining damage.
-  Please note that write support is limited to Windows NT4 and
-  earlier versions.
+CONFIG_NTFS_DEBUG
+  If you are experiencing any problems with the NTFS file system, say
+  Y here. This will result in additional consistency checks to be
+  performed by the driver as well as additional debugging messages to
+  be written to the system log. Note that debugging messages are
+  disabled by default. To enable them, supply the option debug_msgs=1
+  at the kernel command line when booting the kernel or as an option
+  to insmod when loading the ntfs module. Once the driver is active,
+  you can enable debugging messages by doing (as root):
+    echo 1 > /proc/sys/fs/ntfs-debug
+  Replacing the "1" with "0" would disable debug messages.
 
-  If unsure, say N.
+  If you leave debugging messages disabled, this results in little
+  overhead, but enabling debug messages results in very significant
+  slowdown of the system.
+
+  When reporting bugs, please try to have available a full dump of
+  debugging messages while the misbehaviour was occurring.
 
 System V/Xenix/V7/Coherent file system support
 CONFIG_SYSV_FS
diff -Nur linux/Documentation/filesystems/ntfs.txt linux-2.4.18-ntfs-2.0.6a/Documentation/filesystems/ntfs.txt
--- linux/Documentation/filesystems/ntfs.txt	Fri Dec 21 18:41:53 2001
+++ linux-2.4.18-ntfs-2.0.6a/Documentation/filesystems/ntfs.txt	Mon May  6 23:17:53 2002
@@ -1,68 +1,140 @@
-NTFS Overview
-=============
+The Linux NTFS filesystem driver
+================================
 
-Legato Systems, Inc. (http://www.legato.com) have sponsored Anton Altaparmakov
-to develop NTFS on Linux since June 2001.
 
-To mount an NTFS volume, use the filesystem type 'ntfs'. The driver
-currently works only in read-only mode, with no fault-tolerance supported.
+Table of contents
+=================
+
+- Overview
+- Supported mount options
+- Features
+- Known bugs and (mis-)features
+- Using Software RAID with NTFS
+- Limitiations when using the MD driver
+- ChangeLog
+
+
+Overview
+========
+
+To mount an NTFS 1.2/3.x (Windows NT4/2000/XP) volume, use the filesystem
+type 'ntfs'. The driver currently works only in read-only mode, with no
+fault-tolerance or journalling supported.
+
+For fault tolerance and raid support (i.e. volume and stripe sets), you can use
+the kernel's Software RAID / MD driver. See section "Using Software RAID with
+NTFS" for details.
 
-If you enable the dangerous(!) write support, make sure you can recover
-from a complete loss of data. Also, download the Linux-NTFS project
-distribution from Sourceforge at http://sourceforge.net/projects/linux-ntfs/
-and always run the included ntfsfix utility after performing a write to an
-NTFS partition from Linux to fix some of the damage done by the Linux NTFS
-driver and to schedule an automatic chkdsk when Windows reboots. You should
-run ntfsfix _after_ unmounting the partition in Linux but _before_ rebooting
-into Windows. During the next reboot into Windows, chkdsk will be run
-automatically fixing the remaining damage. If no errors are found it is a
-good indication that the driver + ntfsfix together worked to full
-satisfaction. (-;
-
-Please note that the experimental write support is limited to Windows NT4 and
-earlier versions at the moment.
-
-If you think you have discovered a bug please have look at the "Known bugs"
-section below to see whether it isn't known already.
-
-For ftdisk support, limited success was reported with volume sets on top of
-the md driver, although mirror and stripe sets should work as well - if the
-md driver can be talked into using the same layout as Windows NT. However,
-using the md driver will fail if any of your NTFS partitions have an odd
-number of sectors.
 
 Supported mount options
 =======================
 
-iocharset=name		Character set to use when returning file names.
+In addition to the generic mount options described by the manual page for the
+mount command (man 8 mount, also see man 5 fstab), the NTFS driver supports the
+following 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
 			sets contain insufficient characters to represent all
 			possible Unicode characters that can exist on NTFS. To
 			be sure you are not missing any files, you are advised
-			to use the iocharset=utf8 which should be capable of
-			representing all Unicode characters.
+			to use nls=utf8 which is capable of representing all
+			Unicode characters.
 
-utf8=<bool>		Use UTF-8 for converting file names. - It is preferable
-			to use iocharset=utf8 instead, but if the utf8 NLS is
-			not available, you can use this utf8 option, which
-			enables the driver's builtin utf8 conversion functions.
+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=			These options work as documented in mount(8).
-			By default, the files are owned by root and
-			not readable by anyone else.
-
-posix=<bool>		If enabled, the file system distinguishes between
-			upper and lower case. The 8.3 alias names are presented
-			as hard links instead of being suppressed.
-
-show_sys_files=<bool>	If enabled, show all system files as normal files. Note
-			that $MFT does not appear unless specifically
-			requested. For example in bash, use: "ls -l \$MFT".
-			Be careful not to write anything to them or you could
-			crash the kernel and/or corrupt your file system!
+umask=			Provide default owner, group, and access mode mask.
+			These options work as documented in mount(8). By
+			default, the files/directories are owned by root and
+			he/she has read and write permissions, as well as
+			browse permission for directories. No one else has any
+			access permissions. I.e. the mode on all files is by
+			default rw------- and for directories rwx------, a
+			consequence of the default fmask=0177 and dmask=0077.
+			Using a umask of zero will grant all permissions to
+			everyone, i.e. all files and directories will have mode
+			rwxrwxrwx.
+
+fmask=
+dmask=			Instead of specifying umask which applies both to
+			files and directories, fmask applies only to files and
+			dmask only to directories.
+
+sloppy=<BOOL>		If sloppy is specified, ignore unknown mount options.
+			Otherwise the default behaviour is to abort mount if
+			any unknown options are found.
+
+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
+			values can be used for "opt":
+			   system: show system files
+			   win32:  long file names (includes POSIX) [DEFAULT]
+			   long:   same as win32
+			   dos:    short file names only (excludes POSIX)
+			   short:  same as dos
+			   posix:  same as both win32 and dos
+			   all:    all file names
+			Note that the options are additive, i.e. specifying:
+			   show_inodes=system,show_inodes=win32,show_inodes=dos
+			is the same as specifying:
+			   show_inodes=all
+			Note that the "posix" and "all" options will show all
+			directory names, BUT the link count on each directory
+			inode entry is set to 1, due to Linux not supporting
+			directory hard links. This may well confuse some
+			user space applications, since the directory names will
+			have the same inode numbers. Thus it is NOT advisable
+			to use the "posix" and "all" options. We provide them
+			only for completeness sake.
+			Further, note that the "system" option will not show
+			"$MFT" due to bugs/mis-features in glibc. Even though
+			it does not show, you can specifically "ls" it:
+				ls -l \$MFT
+			And of course you can stat it, too.
+			Further, note that irrespective of what show_inodes
+			option(s) you use, all files are accessible when you
+			specify the correct name, even though they may not be
+			shown in a normal "ls", i.e. you can always access the
+			system files and both the short and long file names of
+			files and directories.
+			Finally, note that win32 and dos file names are not
+			case sensitive and can be accessed using any
+			combination of lower and upper case, while POSIX file
+			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
@@ -82,173 +154,136 @@
 				2		25%
 				3		37.5%
 				4		50%
+			Note this option is irrelevant for read-only mounts.
+
+
+Features
+========
+
+- This is a complete rewrite of the NTFS driver that used to be in the kernel.
+  This new driver implements NTFS read support and is functionally equivalent
+  to the old ntfs driver.
+- The new driver has full support for sparse files on NTFS 3.x volumes which
+  the old driver isn't happy with.
+- The new driver supports execution of binaries due to mmap() now being
+  supported.
+- 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
 =============================
 
-- Do not use the driver for writing as it corrupts the file system. If you do
-  use it, get the Linux-NTFS tools and use the ntfsfix utility after
-  dismounting a partition you wrote to.
-
-- Writing of extension records is not supported properly.
+- None
 
-Please send bug reports/comments/feed back/abuse to the Linux-NTFS development
+Please send bug reports/comments/feedback/abuse to the Linux-NTFS development
 list at sourceforge: linux-ntfs-dev@lists.sourceforge.net
 
+
+Using Software RAID with NTFS
+=============================
+
+For support of volume and stripe sets, use the kernel's Software RAID / MD
+driver and set up your /etc/raidtab appropriately (see man 5 raidtab).
+
+Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level 0,
+have been tested and work fine (though see section "Limitiations when using the
+MD driver with NTFS volumes" especially if you want to use linear raid). Even
+though untested, there is no reason why mirrors, i.e. raid level 1, and stripes
+with parity, i.e. raid level 5, should not work, too.
+
+You have to use the "persistent-superblock 0" option for each raid-disk in the
+NTFS volume/stripe you are configuring in /etc/raidtab as the persistent
+superblock used by the MD driver would damange the NTFS volume.
+
+Windows by default uses a stripe chunk size of 64k, so you probably want the
+"chunk-size 64k" option for each raid-disk, too.
+
+For example, if you have a stripe set consisting of two partitions /dev/hda5
+and /dev/hdb1 your /etc/raidtab would look like this:
+
+raiddev /dev/md0
+	raid-level	0
+	nr-raid-disks	2
+	nr-spare-disks	0
+	persistent-superblock	0
+	chunk-size	64k
+	device		/dev/hda5
+	raid-disk	0
+	device		/dev/hdb1
+	raid-disl	1
+
+For linear raid, just change the raid-level above to "raid-level linear", for
+mirrors, change it to "raid-level 1", and for stripe sets with parity, change
+it to "raid-level 5".
+
+Note for stripe sets with parity you will also need to tell the MD driver which
+parity algorithm to use by specifying the option "parity-algorithm which",
+where you need to replace "which" with the name of the algorithm to use (see
+man 5 raidtab for available algorithms) and you will have to try the different
+available algorithms until you find one that works. Make sure you are working
+read-only when playing with this as you may damage your data otherwise. If you
+find which algorithm works please let us know (email the linux-ntfs developers
+list linux-ntfs-dev@lists.sourceforge.net or drop in on IRC in channel #ntfs
+on the irc.openprojects.net network) so we can update this documentation.
+
+Once the raidtab is setup, run for example raid0run -a to start all devices or
+raid0run /dev/md0 to start a particular md device, in this case /dev/md0.
+
+Then just use the mount command as usual to mount the ntfs volume using for
+example:	mount -t ntfs -o ro /dev/md0 /mnt/myntfsvolume
+
+It is advisable to do the mount read-only to see if the md volume has been
+setup correctly to avoid the possibility of causing damage to the data on the
+ntfs volume.
+
+
+Limitiations when using the MD driver
+=====================================
+
+Using the md driver will not work properly if any of your NTFS partitions have
+an odd number of sectors. This is especially important for linear raid as all
+data after the first partition with an odd number of sectors will be offset by
+one or more sectors so if you mount such a partition with write support you
+will cause massive damage to the data on the volume which will only become
+apparent when you try to use the volume again under Windows.
+
+So when using linear raid, make sure that all your partitions have an even
+number of sectors BEFORE attempting to use it. You have been warned!
+
+
 ChangeLog
 =========
 
-NTFS 1.1.21:
-	- Fixed bug with reading $MFT where we try to read higher mft records
-	  before having read the $DATA attribute of $MFT. (Note this is only a
-	  partial solution which will only work in the case that the attribute
-	  list is resident or non-resident but $DATA is in the first 1024
-	  bytes. But this should be enough in the majority of cases. I am not
-	  going to bother fixing the general case until someone finds this to
-	  be a problem for them, which I doubt very much will ever happen...)
-	- Fixed bogus BUG() call in readdir().
-
-NTFS 1.1.20:
-	- Fixed two bugs in ntfs_readwrite_attr(). Thanks to Jan Kara for
-	  spotting the out of bounds one.
-	- Check return value of set_blocksize() in ntfs_read_super() and make
-	  use of get_hardsect_size() to determine the minimum block size.
-	- Fix return values of ntfs_vcn_to_lcn(). This should stop
-	  peoples start of partition being overwritten at random.
-
-NTFS 1.1.19:
-	- Fixed ntfs_getdir_unsorted(), ntfs_readdir() and ntfs_printcb() to
-	  cope with arbitrary cluster sizes. Very important for Win2k+. Also,
-	  make them detect directories which are too large and truncate the
-	  enumeration pretending end of directory was reached. Detect more
-	  error conditions and overflows. All this fixes the problem where the
-	  driver could end up in an infinite loop under certain circumstances.
-	- Fixed potential memory leaks in Unicode conversion functions and
-	  setup correct NULL return values.
-
-NTFS 1.1.18:
-
-	- Enhanced & bug fixed cluster deallocation (race fixes, etc.)
-	- Complete rewrite of cluster allocation, now race free.
-	- Fixed several bugs in the attribute modification codepaths.
-	- Hopefully fixed bug where the first sectors of some people's
-	  partitions would be overwritten by the mft. And in general fixed up
-	  mft extension code a bit (still incomplete though).
-	- Introduce splice_runlist() to allow generic splicing of two run
-	  lists into one.
-	- MFT zone is now implemented. [Stage 2 of 3; only lack dynamic
-	  growing of mft zone but that is AFAIK not even done by Windows, and
-	  the overhead would be so large that it is probably not worth doing
-	  at all, so Stage 3 might never happen...]
-	- Complete rewrite of $MFT extension and ntfs inode allocation code.
-	- Made the NTFS driver initialization string show the compile options
-	  used (i.e. whether read-only or read-write, whether a module, and
-	  whether with debug support).
-	- Modify ntfs_fill_mft_header() to set all fields and to accept more
-	  arguments.
-	- Get rid of superfluous add_mft_header().
-	- Get rid of some unused code.
-	- Fixed several bugs in and generally cleaned up ntfs_readdir,
-	  ntfs_getdir_unsorted(), and ntfs_printcb. Now they spew out huge
-	  amounts of debug output if debugging is enabled. This will be
-	  removed once I know that this works for everyone.
-	- ntfs_readdir now shows hidden files. The only files that are now
-	  hidden are the first 16 inodes (i.e. the hard coded system files),
-	  which is consistent with Windows NT4. Using the show_sys_files mount
-	  option, these files are then shown, too.
-	- Fixed the displaying of the "." and ".." directories. We still cannot
-	  cope with more than 65536 files in a directory index block which is
-	  not a problem and we now cannot cope with more than 32766 directory
-	  index blocks which should not be a problem unless you have a
-	  directory with an insanely large number of files in it. The exact
-	  number depends on the length of the file names of the directory
-	  entries and on the size of the dircetory index blocks.
-	- Fixed all problems with the last file in a directory (e.g. the last
-	  file should no longer disappear and tab completion should work). If
-	  there are still disappearing files or any other problems with the
-	  last file in a directory, please report them! Thanks.
-	- Rewrote ntfs_extend_attr() to use the new cluster allocator and the
-	  freshly introduced splice_runlists() function. This simplified
-	  ntfs_extend_attr() a lot which in turn seems to have removed one or
-	  more bugs from it.
-	- Probably other things I have forgotten... (-;
-	- Removed dollar signs from the names in the system file enumeration.
-	  Apparently gcc doesn't support dollar signs on PPC architecture.
-	  (Andrzej Krzysztofowicz)
-
-NTFS 1.1.17:
-
-	- Fixed system file handling. No longer need to use show_sys_files
-	  option for driver to work fine. System files are now always treated
-	  the same, but without the option, they are made invisible to
-	  directory listings. As a result system files can once again be opened
-	  even without the show_sys_files option. This is important for the
-	  statfs system call to work properly, for example.
-	- Implemented MFT zone including mount parameter to tune it (just like
-	  in Windows via the registry, only we make it per mount rather than
-	  global for the whole driver, so we are better but we have no way of
-	  storing the value as we don't have a registry so either specify on
-	  each mount or put it in /etc/fstab). [Stage 1 of 3, mount parameter
-	  handling.]
-	- Fixed fixup functions to handle corruption cases and to return error
-	  codes to the caller.
-	- Made fixup functions apply hotfixes where sensible. [Stage 1 of 2+,
-	  in memory only.]
-	- Fixed ommission of "NTFS: " string in ntfs_error() output.
-	- Fixed stupid if statement bug in unistr.c. Thanks to Yann E. Morin
-	  for spotting it. 
-	- Get rid of all uses of max and min macros. This actually allowed for
-	  optimizing the code in several places so it was a Good Thing(TM).
-	- Make ntfs use generic_file_open to enforce the O_LARGEFILE flag.
-	- Detect encrypted files and refuse to access them (return EACCES
-	  error code to user space).
-	- Fix handling of encrypted & compressed files so that an encrypted
-	  file no longer is considered to be compressed (this was causing
-	  kernel segmentation faults).
-
-NTFS 1.1.16:
-
-	- Removed non-functional uni_xlate mount options.
-	- Clarified the semantics of the utf8 and iocharset mount options.
-	- Threw out the non-functional mount options for using hard coded
-	  character set conversion. Only kept utf8 one.
-	- Fixed handling of mount options and proper handling of faulty mount
-	  options on remount.
-	- Cleaned up character conversion which basically became simplified a
-	  lot due to the removal of the above mentioned mount options.
-	- Made character conversion to be always consistent. Previously we
-	  could output to the VFS file names which we would then not accept
-	  back from the VFS so in effect we were generating ghost entries in
-	  the directory listings which could not be accessed by any means.
-	- Simplified time conversion functions drastically without sacrificing
-	  accuracy. (-8
-	- Fixed a use of a pointer before the check for the pointer being
-	  NULL, reported by the Stanford checker.
-	- Fixed several missing error checks, reported by the Stanford
-	  checker and fixed by Rasmus Andersen.
-
-NTFS 1.1.15 (changes since kernel 2.4.4's NTFS driver):
-
-	- New mount option show_sys_files=<bool> to show all system files as
-	  normal files.
-	- Support for files and in general any attributes up to the full 2TiB
-	  size supported by the NTFS filesystem. Note we only support up to
-	  32-bits worth of inodes/clusters at this point.
-	- Support for more than 128kiB sized runlists (using vmalloc_32()
-	  instead of kmalloc()).
-	- Fixed races in allocation of clusters and mft records.
-	- Fixed major bugs in attribute handling / searching / collation.
-	- Fixed major bugs in compressing a run list into a mapping pairs array.
-	- Fixed major bugs in inode allocation. Especially file create and
-	  mkdir.
-	- Fixed memory leaks.
-	- Fixed major bug in inode layout assignment of sequence numbers.
-	- Lots of other bug fixes I can't think of right now...
-	- Fixed NULL bug found by the Stanford checker in ntfs_dupuni2map().
-	- Convert large stack variable to dynamically allocated one in
-	  ntfs_get_free_cluster_count() (found by Stanford checker).
-
-Kernel 2.4.4:
+Note that a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.0.6a:
+	- Backport from 2.5.x to 2.4.18.
+2.0.6:
+	- Major bugfix to make compatible with other kernel changes. This fixes
+	  the hangs/oopses on umount.
+	- Locking cleanup in directory operations (remove BKL usage).
+2.0.5:
+	- Major buffer overflow bug fix.
+	- Minor cleanups and updates for kernel 2.5.12.
+2.0.4:
+	- Cleanups and updates for kernel 2.5.11.
+2.0.3:
+	- Small bug fixes, cleanups, and performance improvements.
+2.0.2:
+	- Use default fmask of 0177 so that files are no executable by default.
+	  If you want owner executable files, just use fmask=0077.
+	- Update for kernel 2.5.9 but preserve backwards compatibility with
+	  kernel 2.5.7.
+	- Minor bug fixes, cleanups, and updates.
+2.0.1:
+	- Minor updates, primarily set the executable bit by default on files
+	  so they can be executed.
+2.0.0:
 	- Started ChangeLog.
 
diff -Nur linux/MAINTAINERS linux-2.4.18-ntfs-2.0.6a/MAINTAINERS
--- linux/MAINTAINERS	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/MAINTAINERS	Mon May  6 23:17:56 2002
@@ -1122,9 +1122,10 @@
 
 NTFS FILESYSTEM
 P:	Anton Altaparmakov
-M:	aia21@cus.cam.ac.uk
+M:	aia21@cantab.net
 L:	linux-ntfs-dev@lists.sourceforge.net
 L:	linux-kernel@vger.kernel.org
+W:	http://linux-ntfs.sf.net/
 S:	Maintained
 
 NVIDIA (RIVA) FRAMEBUFFER DRIVER
diff -Nur linux/arch/alpha/defconfig linux-2.4.18-ntfs-2.0.6a/arch/alpha/defconfig
--- linux/arch/alpha/defconfig	Tue Nov 20 00:19:42 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/alpha/defconfig	Mon May  6 23:16:42 2002
@@ -564,7 +564,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/a5k linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/a5k
--- linux/arch/arm/def-configs/a5k	Tue Nov 28 02:07:59 2000
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/a5k	Mon May  6 23:16:28 2002
@@ -394,7 +394,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/adsbitsy linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/adsbitsy
--- linux/arch/arm/def-configs/adsbitsy	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/adsbitsy	Mon May  6 23:16:29 2002
@@ -488,7 +488,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/anakin linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/anakin
--- linux/arch/arm/def-configs/anakin	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/anakin	Mon May  6 23:16:29 2002
@@ -372,7 +372,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/assabet linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/assabet
--- linux/arch/arm/def-configs/assabet	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/assabet	Mon May  6 23:16:29 2002
@@ -667,7 +667,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/brutus linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/brutus
--- linux/arch/arm/def-configs/brutus	Sun Aug 12 20:13:59 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/brutus	Mon May  6 23:16:29 2002
@@ -222,7 +222,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/cerfcube linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfcube
--- linux/arch/arm/def-configs/cerfcube	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfcube	Mon May  6 23:16:28 2002
@@ -660,7 +660,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/cerfpda linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfpda
--- linux/arch/arm/def-configs/cerfpda	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfpda	Mon May  6 23:16:29 2002
@@ -698,7 +698,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/cerfpod linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfpod
--- linux/arch/arm/def-configs/cerfpod	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/cerfpod	Mon May  6 23:16:29 2002
@@ -662,7 +662,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/ebsa110 linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/ebsa110
--- linux/arch/arm/def-configs/ebsa110	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/ebsa110	Mon May  6 23:16:28 2002
@@ -530,7 +530,7 @@
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/edb7211 linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/edb7211
--- linux/arch/arm/def-configs/edb7211	Thu Oct 25 22:53:44 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/edb7211	Mon May  6 23:16:28 2002
@@ -329,7 +329,7 @@
 # CONFIG_JOLIET is not set
 CONFIG_MINIX_FS=y
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/epxa10db linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/epxa10db
--- linux/arch/arm/def-configs/epxa10db	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/epxa10db	Mon May  6 23:16:29 2002
@@ -533,7 +533,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/flexanet linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/flexanet
--- linux/arch/arm/def-configs/flexanet	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/flexanet	Mon May  6 23:16:29 2002
@@ -524,6 +524,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/footbridge linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/footbridge
--- linux/arch/arm/def-configs/footbridge	Tue Nov 28 02:07:59 2000
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/footbridge	Mon May  6 23:16:29 2002
@@ -627,7 +627,7 @@
 CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/freebird linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/freebird
--- linux/arch/arm/def-configs/freebird	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/freebird	Mon May  6 23:16:29 2002
@@ -501,7 +501,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/freebird_new linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/freebird_new
--- linux/arch/arm/def-configs/freebird_new	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/freebird_new	Mon May  6 23:16:29 2002
@@ -521,7 +521,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/graphicsclient linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/graphicsclient
--- linux/arch/arm/def-configs/graphicsclient	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/graphicsclient	Mon May  6 23:16:29 2002
@@ -594,7 +594,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/graphicsmaster linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/graphicsmaster
--- linux/arch/arm/def-configs/graphicsmaster	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/graphicsmaster	Mon May  6 23:16:29 2002
@@ -569,7 +569,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/h3600 linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/h3600
--- linux/arch/arm/def-configs/h3600	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/h3600	Mon May  6 23:16:28 2002
@@ -659,7 +659,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/huw_webpanel linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/huw_webpanel
--- linux/arch/arm/def-configs/huw_webpanel	Sun Aug 12 20:13:59 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/huw_webpanel	Mon May  6 23:16:29 2002
@@ -335,7 +335,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/integrator linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/integrator
--- linux/arch/arm/def-configs/integrator	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/integrator	Mon May  6 23:16:29 2002
@@ -542,7 +542,7 @@
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/jornada720 linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/jornada720
--- linux/arch/arm/def-configs/jornada720	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/jornada720	Mon May  6 23:16:29 2002
@@ -586,7 +586,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/lart linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/lart
--- linux/arch/arm/def-configs/lart	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/lart	Mon May  6 23:16:28 2002
@@ -664,7 +664,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/lusl7200 linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/lusl7200
--- linux/arch/arm/def-configs/lusl7200	Tue Jun 20 02:59:33 2000
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/lusl7200	Mon May  6 23:16:29 2002
@@ -188,7 +188,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/neponset linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/neponset
--- linux/arch/arm/def-configs/neponset	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/neponset	Mon May  6 23:16:29 2002
@@ -653,7 +653,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/omnimeter linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/omnimeter
--- linux/arch/arm/def-configs/omnimeter	Sun Aug 12 20:13:59 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/omnimeter	Mon May  6 23:16:29 2002
@@ -431,7 +431,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pangolin linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pangolin
--- linux/arch/arm/def-configs/pangolin	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pangolin	Mon May  6 23:16:29 2002
@@ -568,7 +568,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pfs168_mqtft linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_mqtft
--- linux/arch/arm/def-configs/pfs168_mqtft	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_mqtft	Mon May  6 23:16:29 2002
@@ -608,7 +608,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pfs168_mqvga linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_mqvga
--- linux/arch/arm/def-configs/pfs168_mqvga	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_mqvga	Mon May  6 23:16:29 2002
@@ -608,7 +608,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pfs168_sastn linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_sastn
--- linux/arch/arm/def-configs/pfs168_sastn	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_sastn	Mon May  6 23:16:29 2002
@@ -601,7 +601,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pfs168_satft linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_satft
--- linux/arch/arm/def-configs/pfs168_satft	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pfs168_satft	Mon May  6 23:16:29 2002
@@ -608,7 +608,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/pleb linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pleb
--- linux/arch/arm/def-configs/pleb	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/pleb	Mon May  6 23:16:28 2002
@@ -459,7 +459,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/rpc linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/rpc
--- linux/arch/arm/def-configs/rpc	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/rpc	Mon May  6 23:16:28 2002
@@ -629,7 +629,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/arm/def-configs/shark linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/shark
--- linux/arch/arm/def-configs/shark	Mon Apr 29 21:50:18 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/def-configs/shark	Mon May  6 23:16:28 2002
@@ -637,7 +637,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/arm/defconfig linux-2.4.18-ntfs-2.0.6a/arch/arm/defconfig
--- linux/arch/arm/defconfig	Sun May 20 02:43:05 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/arm/defconfig	Mon May  6 23:16:29 2002
@@ -420,7 +420,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/cris/defconfig linux-2.4.18-ntfs-2.0.6a/arch/cris/defconfig
--- linux/arch/cris/defconfig	Fri Nov  9 22:58:02 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/cris/defconfig	Mon May  6 23:16:31 2002
@@ -450,7 +450,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/i386/defconfig linux-2.4.18-ntfs-2.0.6a/arch/i386/defconfig
--- linux/arch/i386/defconfig	Mon Apr 29 21:50:19 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/i386/defconfig	Mon May  6 23:16:30 2002
@@ -634,7 +634,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ia64/defconfig linux-2.4.18-ntfs-2.0.6a/arch/ia64/defconfig
--- linux/arch/ia64/defconfig	Mon Apr 29 21:50:20 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ia64/defconfig	Mon May  6 23:16:32 2002
@@ -605,7 +605,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig
--- linux/arch/mips/defconfig	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig	Mon May  6 23:16:39 2002
@@ -442,7 +442,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-atlas linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-atlas
--- linux/arch/mips/defconfig-atlas	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-atlas	Mon May  6 23:16:37 2002
@@ -432,7 +432,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-ddb5476 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ddb5476
--- linux/arch/mips/defconfig-ddb5476	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ddb5476	Mon May  6 23:16:38 2002
@@ -480,7 +480,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-ddb5477 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ddb5477
--- linux/arch/mips/defconfig-ddb5477	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ddb5477	Mon May  6 23:16:38 2002
@@ -393,7 +393,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-decstation linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-decstation
--- linux/arch/mips/defconfig-decstation	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-decstation	Mon May  6 23:16:38 2002
@@ -429,7 +429,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-ip22 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ip22
--- linux/arch/mips/defconfig-ip22	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ip22	Mon May  6 23:16:37 2002
@@ -442,7 +442,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-it8172 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-it8172
--- linux/arch/mips/defconfig-it8172	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-it8172	Mon May  6 23:16:39 2002
@@ -559,7 +559,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-malta linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-malta
--- linux/arch/mips/defconfig-malta	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-malta	Mon May  6 23:16:37 2002
@@ -458,7 +458,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-nino linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-nino
--- linux/arch/mips/defconfig-nino	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-nino	Mon May  6 23:16:37 2002
@@ -269,7 +269,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-ocelot linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ocelot
--- linux/arch/mips/defconfig-ocelot	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-ocelot	Mon May  6 23:16:39 2002
@@ -394,7 +394,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-pb1000 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-pb1000
--- linux/arch/mips/defconfig-pb1000	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-pb1000	Mon May  6 23:16:39 2002
@@ -381,7 +381,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips/defconfig-rm200 linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-rm200
--- linux/arch/mips/defconfig-rm200	Mon Apr 29 21:50:23 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips/defconfig-rm200	Mon May  6 23:16:37 2002
@@ -312,7 +312,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips64/defconfig linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig
--- linux/arch/mips64/defconfig	Mon Apr 29 21:50:25 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig	Mon May  6 23:16:49 2002
@@ -399,7 +399,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips64/defconfig-ip22 linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip22
--- linux/arch/mips64/defconfig-ip22	Mon Apr 29 21:50:25 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip22	Mon May  6 23:16:48 2002
@@ -404,7 +404,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips64/defconfig-ip27 linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip27
--- linux/arch/mips64/defconfig-ip27	Mon Apr 29 21:50:25 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip27	Mon May  6 23:16:48 2002
@@ -399,7 +399,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/mips64/defconfig-ip32 linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip32
--- linux/arch/mips64/defconfig-ip32	Mon Apr 29 21:50:26 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/mips64/defconfig-ip32	Mon May  6 23:16:48 2002
@@ -429,7 +429,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/parisc/defconfig linux-2.4.18-ntfs-2.0.6a/arch/parisc/defconfig
--- linux/arch/parisc/defconfig	Tue Dec  5 21:29:39 2000
+++ linux-2.4.18-ntfs-2.0.6a/arch/parisc/defconfig	Mon May  6 23:16:52 2002
@@ -293,7 +293,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/IVMS8_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/IVMS8_defconfig
--- linux/arch/ppc/configs/IVMS8_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/IVMS8_defconfig	Mon May  6 23:16:29 2002
@@ -414,7 +414,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/SM850_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/SM850_defconfig
--- linux/arch/ppc/configs/SM850_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/SM850_defconfig	Mon May  6 23:16:29 2002
@@ -372,7 +372,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/SPD823TS_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/SPD823TS_defconfig
--- linux/arch/ppc/configs/SPD823TS_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/SPD823TS_defconfig	Mon May  6 23:16:29 2002
@@ -371,7 +371,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/TQM823L_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM823L_defconfig
--- linux/arch/ppc/configs/TQM823L_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM823L_defconfig	Mon May  6 23:16:29 2002
@@ -372,7 +372,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/TQM850L_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM850L_defconfig
--- linux/arch/ppc/configs/TQM850L_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM850L_defconfig	Mon May  6 23:16:29 2002
@@ -372,7 +372,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/TQM860L_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM860L_defconfig
--- linux/arch/ppc/configs/TQM860L_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/TQM860L_defconfig	Mon May  6 23:16:29 2002
@@ -415,7 +415,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/apus_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/apus_defconfig
--- linux/arch/ppc/configs/apus_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/apus_defconfig	Mon May  6 23:16:29 2002
@@ -670,7 +670,7 @@
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/bseip_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/bseip_defconfig
--- linux/arch/ppc/configs/bseip_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/bseip_defconfig	Mon May  6 23:16:29 2002
@@ -371,7 +371,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/common_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/common_defconfig
--- linux/arch/ppc/configs/common_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/common_defconfig	Mon May  6 23:16:29 2002
@@ -724,7 +724,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/ppc/configs/est8260_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/est8260_defconfig
--- linux/arch/ppc/configs/est8260_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/est8260_defconfig	Mon May  6 23:16:29 2002
@@ -355,7 +355,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/gemini_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/gemini_defconfig
--- linux/arch/ppc/configs/gemini_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/gemini_defconfig	Mon May  6 23:16:29 2002
@@ -453,7 +453,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/ppc/configs/ibmchrp_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/ibmchrp_defconfig
--- linux/arch/ppc/configs/ibmchrp_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/ibmchrp_defconfig	Mon May  6 23:16:29 2002
@@ -593,7 +593,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/ppc/configs/mbx_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/mbx_defconfig
--- linux/arch/ppc/configs/mbx_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/mbx_defconfig	Mon May  6 23:16:29 2002
@@ -364,7 +364,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/oak_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/oak_defconfig
--- linux/arch/ppc/configs/oak_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/oak_defconfig	Mon May  6 23:16:29 2002
@@ -352,7 +352,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/pmac_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/pmac_defconfig
--- linux/arch/ppc/configs/pmac_defconfig	Mon Apr 29 21:50:27 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/pmac_defconfig	Mon May  6 23:16:29 2002
@@ -819,7 +819,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/ppc/configs/power3_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/power3_defconfig
--- linux/arch/ppc/configs/power3_defconfig	Mon Apr 29 21:50:28 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/power3_defconfig	Mon May  6 23:16:29 2002
@@ -577,7 +577,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/rpxcllf_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/rpxcllf_defconfig
--- linux/arch/ppc/configs/rpxcllf_defconfig	Mon Apr 29 21:50:28 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/rpxcllf_defconfig	Mon May  6 23:16:29 2002
@@ -371,7 +371,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/rpxlite_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/rpxlite_defconfig
--- linux/arch/ppc/configs/rpxlite_defconfig	Mon Apr 29 21:50:28 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/rpxlite_defconfig	Mon May  6 23:16:29 2002
@@ -371,7 +371,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/configs/walnut_defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/walnut_defconfig
--- linux/arch/ppc/configs/walnut_defconfig	Mon Apr 29 21:50:28 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/configs/walnut_defconfig	Mon May  6 23:16:29 2002
@@ -356,7 +356,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/ppc/defconfig linux-2.4.18-ntfs-2.0.6a/arch/ppc/defconfig
--- linux/arch/ppc/defconfig	Mon Feb 25 20:37:55 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/ppc/defconfig	Mon May  6 23:16:30 2002
@@ -724,7 +724,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/s390/defconfig linux-2.4.18-ntfs-2.0.6a/arch/s390/defconfig
--- linux/arch/s390/defconfig	Mon Apr 29 21:50:29 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/s390/defconfig	Mon May  6 23:16:41 2002
@@ -206,7 +206,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/s390x/defconfig linux-2.4.18-ntfs-2.0.6a/arch/s390x/defconfig
--- linux/arch/s390x/defconfig	Mon Apr 29 21:50:29 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/s390x/defconfig	Mon May  6 23:16:42 2002
@@ -206,7 +206,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
diff -Nur linux/arch/sh/defconfig linux-2.4.18-ntfs-2.0.6a/arch/sh/defconfig
--- linux/arch/sh/defconfig	Mon Oct 15 22:36:48 2001
+++ linux-2.4.18-ntfs-2.0.6a/arch/sh/defconfig	Mon May  6 23:16:28 2002
@@ -165,7 +165,7 @@
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/sparc/defconfig linux-2.4.18-ntfs-2.0.6a/arch/sparc/defconfig
--- linux/arch/sparc/defconfig	Mon Feb 25 20:37:56 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/sparc/defconfig	Mon May  6 23:16:43 2002
@@ -296,7 +296,7 @@
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/arch/sparc64/defconfig linux-2.4.18-ntfs-2.0.6a/arch/sparc64/defconfig
--- linux/arch/sparc64/defconfig	Mon Apr 29 21:50:30 2002
+++ linux-2.4.18-ntfs-2.0.6a/arch/sparc64/defconfig	Mon May  6 23:16:48 2002
@@ -607,7 +607,7 @@
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Nur linux/fs/Config.in linux-2.4.18-ntfs-2.0.6a/fs/Config.in
--- linux/fs/Config.in	Mon Apr 29 21:50:44 2002
+++ linux-2.4.18-ntfs-2.0.6a/fs/Config.in	Mon May  6 23:16:25 2002
@@ -54,8 +54,9 @@
 tristate 'Minix fs support' CONFIG_MINIX_FS
 
 tristate 'FreeVxFS file system support (VERITAS VxFS(TM) compatible)' CONFIG_VXFS_FS
+
 tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
-dep_mbool '  NTFS write support (DANGEROUS)' CONFIG_NTFS_RW $CONFIG_NTFS_FS $CONFIG_EXPERIMENTAL
+dep_mbool '  NTFS debugging support' CONFIG_NTFS_DEBUG $CONFIG_NTFS_FS
 
 tristate 'OS/2 HPFS file system support' CONFIG_HPFS_FS
 
diff -Nur linux/fs/ntfs/ChangeLog linux-2.4.18-ntfs-2.0.6a/fs/ntfs/ChangeLog
--- linux/fs/ntfs/ChangeLog	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/ChangeLog	Mon May  6 23:16:24 2002
@@ -0,0 +1,478 @@
+ToDo:
+	- Find and fix bugs.
+	- W.r.t. s_maxbytes still need to be careful on reading/truncating as
+	  there are dragons lurking in the details, e.g. read_inode() currently
+	  does no checks for file size wrt s_maxbytes. So what happens when a
+	  user open()s a file with i_size > s_maxbytes? Should read_inode()
+	  truncate the visible i_size? Will the user just get -E2BIG (or
+	  whatever) on open()? Or will (s)he be able to open() but lseek() and
+	  read() will fail when s_maxbytes is reached? -> Investigate this!
+	- Implement/allow non-resident index bitmaps in dir.c::ntfs_readdir()
+	  and then also consider initialized_size w.r.t. the bitmaps, etc.
+	- vcn_to_lcn() should somehow return the correct pointer within the
+	  ->run_list so we can get at the lcns for the following vcns, this is
+	  strictly a speed optimization. Obviously need to keep the ->run_list
+	  locked or RACE. load_attribute_list() already performs such an
+	  optimization so use the same optimization where desired.
+	- Consider if ntfs_file_read_compressed_block() shouldn't be coping
+	  with initialized_size < data_size. I don't think it can happen but
+	  it requires more careful consideration.
+	- CLEANUP: Modularise and reuse code in aops.c. At the moment we have
+	  several copies of almost identicall functions and the functions are
+	  quite big. Modularising them a bit, e.g. a-la get_block(), will make
+	  them cleaner and make code reuse easier.
+	- Want to use dummy inodes for address space i/o. We need some VFS
+	  changes first, which are currently under discussion.
+
+2.0.6a - Initial backport of the driver to the 2.4.18 kernel.
+
+	Backported all main features of the driver. It runs stable at my
+	box - it survived the crash test :-)). All 2.5.x speficic changes
+	were left over (eg. dropping BKL, changes in mtfbmp initialization,
+	dropping setting old blocksize in the error path).
+
+2.0.6 - Major bugfix to make compatible with other kernel changes.
+
+	- Initialize the mftbmp address space properly now that there are more
+	  fields in the struct address_space. This was leading to hangs and
+	  oopses on umount since 2.5.12 because of changes to other parts of
+	  the kernel. We probably want a kernel generic init_address_space()
+	  function...
+	- Drop BKL from ntfs_readdir() after consultation with Al Viro. The
+	  only caller of ->readdir() is vfs_readdir() which holds i_sem during
+	  the call, and i_sem is sufficient protection against changes in the
+	  directory inode (including ->i_size).
+	- Use generic_file_llseek() for directories (as opposed to
+	  default_llseek()) as this downs i_sem instead of the BKL which is
+	  what we now need for exclusion against ->f_pos changes considering we
+	  no longer take the BKL in ntfs_readdir().
+
+2.0.5 - Major bugfix. Buffer overflow in extent inode handling.
+
+	- No need to set old blocksize in super.c::ntfs_fill_super() as the
+	  VFS does so via invocation of deactivate_super() calling
+	  fs->fill_super() calling block_kill_super() which does it.
+	- BKL moved from VFS into dir.c::ntfs_readdir(). (Linus Torvalds)
+	  -> Do we really need it? I don't think so as we have exclusion on
+	  the directory ntfs_inode rw_semaphore mrec_lock. We mmight have to
+	  move the ->f_pos accesses under the mrec_lock though. Check this...
+	- Fix really, really, really stupid buffer overflow in extent inode
+	  handling in mft.c::map_extent_mft_record().
+
+2.0.4 - Cleanups and updates for kernel 2.5.11.
+
+	- Add documentation on how to use the MD driver to be able to use NTFS
+	  stripe and volume sets in Linux and generally cleanup documentation
+	  a bit.
+	Remove all uses of kdev_t in favour of struct block_device *:
+	- Change compress.c::ntfs_file_read_compressed_block() to use
+	  sb_getblk() instead of getblk().
+	- Change super.c::ntfs_fill_super() to use bdev_hardsect_size() instead
+	  of get_hardsect_size().
+	- No need to get old blocksize in super.c::ntfs_fill_super() as
+	  fs/super.c::get_sb_bdev() already does this.
+	- Set bh->b_bdev instead of bh->b_dev throughout aops.c.
+
+2.0.3 - Small bug fixes, cleanups, and performance improvements.
+
+	- Remove some dead code from mft.c.
+	- Optimize readpage and read_block functions throughout aops.c so that
+	  only initialized blocks are read. Non-initialized ones have their
+	  buffer head mapped, zeroed, and set up to date, without scheduling
+	  any i/o. Thanks to Al Viro for advice on how to avoid the device i/o.
+	Thanks go to Andrew Morton for spotting the below:
+	- Fix buglet in allocate_compression_buffers() error code path.
+	- Call flush_dcache_page() after modifying page cache page contents in
+	  ntfs_file_readpage().
+	- Check for existence of page buffers throughout aops.c before calling
+	  create_empty_buffers(). This happens when an I/O error occurs and the
+	  read is retried. (It also happens once writing is implemented so that
+	  needed doing anyway but I had left it for later...)
+	- Don't BUG_ON() uptodate and/or mapped buffers throughout aops.c in
+	  readpage and read_block functions. Reasoning same as above (i.e. I/O
+	  error retries and future write code paths.)
+
+2.0.2 - Minor updates and cleanups.
+
+	- Cleanup: rename mst.c::__post_read_mst_fixup to post_write_mst_fixup
+	  and cleanup the code a bit, removing the unused size parameter.
+	- Change default fmask to 0177 and update documentation.
+	- Change attrib.c::get_attr_search_ctx() to return the search context
+	  directly instead of taking the address of a pointer. A return value
+	  of NULL means the allocation failed. Updated all callers
+	  appropriately.
+	- Update to 2.5.9 kernel (preserving backwards compatibility) by
+	  replacing all occurences of page->buffers with page_buffers(page).
+	- Fix minor bugs in run list merging, also minor cleanup.
+	- Updates to bootsector layout and mft mirror contents descriptions.
+	- Small bug fix in error detection in unistr.c and some cleanups.
+	- Grow name buffer allocations in unistr.c in aligned mutlipled of 64
+	  bytes.
+
+2.0.1 - Minor updates.
+
+	- Make default umask correspond to documentation.
+	- Improve documentation.
+	- Set default mode to include execute bit. The {u,f,d}mask can be used
+	  to take it away if desired. This allows binaries to be executed from
+	  a mounted ntfs partition.
+
+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
+	  from the CVS import into BitKeeper.
+	- Begin to implement proper handling of allocated_size vs
+	  initialized_size vs data_size (i.e. i_size). Done are
+	  mft.c::ntfs_mft_readpage(), aops.c::end_buffer_read_index_async(),
+	  and attrib.c::load_attribute_list().
+	- Lock the run list in attrib.c::load_attribute_list() while using it.
+	- Fix memory leak in ntfs_file_read_compressed_block() and generally
+	  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
+	  equivalent of ntfs_file_get_block() in ntfs_mst_readpage() itself.
+	  I am aiming for correctness at the moment. Modularisation can come
+	  later.
+	- Rename aops.c::end_buffer_read_index_async() to
+	  end_buffer_read_mst_async() and optimize the overflow checking and
+	  handling.
+	- Use the host of the mftbmp address space mapping to hold the ntfs
+	  volume. This is needed so the async i/o completion handler can
+	  retrieve a pointer to the volume. Hopefully this will not cause
+	  problems elsewhere in the kernel... Otherwise will need to use a
+	  fake inode.
+	- 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.
+	- 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/
+
+	- Replace bdevname(sb->s_dev) with sb->s_id.
+	- Remove now superfluous new-line characters in all callers of
+	  ntfs_debug().
+	- Apply kludge in ntfs_read_inode(), setting i_nlink to 1 for
+	  directories. Without this the "find" utility gets very upset which is
+	  fair enough as Linux/Unix do not support directory hard links.
+	- Further run list merging work. (Richard Russon)
+	- Backwards compatibility for gcc-2.95. (Richard Russon)
+	- Update to kernel 2.5.5-pre1 and rediff the now tiny patch.
+	- Convert to new file system declaration using ->ntfs_get_sb() and
+	  replacing ntfs_read_super() with ntfs_fill_super().
+	- Set s_maxbytes to MAX_LFS_FILESIZE to avoid page cache page index
+	  overflow on 32-bit architectures.
+	- Cleanup upcase loading code to use ntfs_(un)map_page().
+	- Disable/reenable preemtion in critical sections of compession engine.
+	- Replace device size determination in ntfs_fill_super() with
+	  sb->s_bdev->bd_inode->i_size (in bytes) and remove now superfluous
+	  function super.c::get_nr_blocks().
+	- Implement a mount time option (show_inodes) allowing choice of which
+	  types of inode names readdir() returns and modify ntfs_filldir()
+	  accordingly. There are several parameters to show_inodes:
+		system:	system files
+	  	win32:	long file names (including POSIX file names) [DEFAULT]
+		long:	same as win32
+	  	dos:	short file names only (excluding POSIX file names)
+		short:	same as dos
+		posix:	same as both win32 and dos
+	  	all:	all file names
+	  Note that the options are additive, i.e. specifying:
+		-o show_inodes=system,show_inodes=win32,show_inodes=dos
+	  is the same as specifying:
+		-o show_inodes=all
+	  Note that the "posix" and "all" options will show all directory
+	  names, BUT the link count on each directory inode entry is set to 1,
+	  due to Linux not supporting directory hard links. This may well
+	  confuse some userspace applications, since the directory names will
+	  have the same inode numbers. Thus it is NOT advisable to use the
+	  "posix" or "all" options. We provide them only for completeness sake.
+	- Add copies of allocated_size, initialized_size, and compressed_size to
+	  the ntfs inode structure and set them up in
+	  inode.c::ntfs_read_inode(). These reflect the unnamed data attribute
+	  for files and the index allocation attribute for directories.
+	- Add copies of allocated_size and initialized_size to ntfs inode for
+	  $BITMAP attribute of large directories and set them up in
+	  inode.c::ntfs_read_inode().
+	- Add copies of allocated_size and initialized_size to ntfs volume for
+	  $BITMAP attribute of $MFT and set them up in
+	  super.c::load_system_files().
+	- Parse deprecated ntfs driver options (iocharset, show_sys_files,
+	  posix, and utf8) and tell user what the new options to use are. Note
+	  we still do support them but they will be removed with kernel 2.7.x.
+	- Change all occurences of integer long long printf formatting to hex
+	  as printk() will not support long long integer format if/when the
+	  div64 patch goes into the kernel.
+	- Make slab caches have stable names and change the names to what they
+	  were intended to be. These changes are required/made possible by the
+	  new slab cache name handling which removes the length limitation by
+	  requiring the caller of kmem_cache_create() to supply a stable name
+	  which is then referenced but not copied.
+	- Rename run_list structure to run_list_element and create a new
+	  run_list structure containing a pointer to a run_list_element
+	  structure and a read/write semaphore. Adapt all users of run lists
+	  to new scheme and take and release the lock as needed. This fixes a
+	  nasty race as the run_list changes even when inodes are locked for
+	  reading and even when the inode isn't locked at all, so we really
+	  needed the serialization. We use a semaphore rather than a spinlock
+	  as memory allocations can sleep and doing everything GFP_ATOMIC
+	  would be silly.
+	- Cleanup read_inode() removing all code checking for lowest_vcn != 0.
+	  This can never happen due to the nature of lookup_attr() and how we
+	  support attribute lists. If it did happen it would imply the inode
+	  being corrupt.
+	- Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as
+	  bad if found.
+	- Update to 2.5.6-pre2 changes in struct address_space.
+	- Use parent_ino() when accessing d_parent inode number in dir.c.
+	- Import Sourceforge CVS repository into BitKeeper repository:
+		http://linux-ntfs.bkbits.net/ntfs-tng-2.5
+	- Update fs/Makefile, fs/Config.help, fs/Config.in, and
+	  Documentation/filesystems/ntfs.txt for NTFS TNG.
+	- Create kernel configuration option controlling whether debugging
+	  is enabled or not.
+	- Add the required export of end_buffer_io_sync() from the patches
+	  directory to the kernel code.
+	- Update inode.c::ntfs_show_options() with show_inodes mount option.
+	- Update errors mount option.
+
+tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only!
+
+	- Cleanup mft.c and it's debug/error output in particular. Fix a minor
+	  bug in mapping of extent inodes. Update all the comments to fit all
+	  the recent code changes.
+	- Modify vcn_to_lcn() to cope with entirely unmapped run lists.
+	- Cleanups in compress.c, mostly comments and folding help.
+	- Implement attrib.c::map_run_list() as a generic helper.
+	- Make compress.c::ntfs_file_read_compressed_block() use map_run_list()
+	  thus making code shorter and enabling attribute list support.
+	- Cleanup incorrect use of [su]64 with %L printf format specifier in
+	  all source files. Type casts to [unsigned] long long added to correct
+	  the mismatches (important for architectures which have long long not
+	  being 64 bits).
+	- Merge async io completion handlers for directory indexes and $MFT
+	  data into one by setting the index_block_size{_bits} of the ntfs
+	  inode for $MFT to the mft_record_size{_bits} of the ntfs_volume.
+	- Cleanup aops.c, update comments.
+	- Make ntfs_file_get_block() use map_run_list() so all files now
+	  support attribute lists.
+	- Make ntfs_dir_readpage() almost verbatim copy of
+	  block_read_full_page() by using ntfs_file_get_block() with only real
+	  difference being the use of our own async io completion handler
+	  rather than the default one, thus reducing the amount of code and
+	  automatically enabling attribute list support for directory indices.
+	- Fix bug in load_attribute_list() - forgot to call brelse in error
+	  code path.
+	- Change parameters to find_attr() and lookup_attr(). We no longer
+	  pass in the upcase table and its length. These can be gotten from
+	  ctx->ntfs_ino->vol->upcase{_len}. Update all callers.
+	- Cleanups in attrib.c. 
+	- Implement merging of run lists, attrib.c::merge_run_lists() and its
+	  helpers. (Richard Russon)
+	- Attribute lists part 2, attribute extents and multi part run lists:
+	  enable proper support for LCN_RL_NOT_MAPPED and automatic mapping of
+	  further run list parts via attrib.c::map_run_list().
+	- Tiny endianness bug fix in decompress_mapping_pairs().
+
+tng-0.0.6 - Encrypted directories, bug fixes, cleanups, debugging enhancements.
+
+	- Enable encrypted directories. (Their index root is marked encrypted
+	  to indicate that new files in that directory should be created
+	  encrypted.)
+	- Fix bug in NInoBmpNonResident() macro. (Cut and paste error.)
+	- Enable $Extend system directory. Most (if not all) extended system
+	  files do not have unnamed data attributes so ntfs_read_inode() had to
+	  special case them but that is ok, as the special casing recovery
+	  happens inside an error code path so there is zero slow down in the
+	  normal fast path. The special casing is done by introducing a new
+	  function inode.c::ntfs_is_extended_system_file() which checks if any
+	  of the hard links in the inode point to $Extend as being their parent
+	  directory and if they do we assume this is an extended system file.
+	- Create a sysctl/proc interface to allow {dis,en}abling of debug output
+	  when compiled with -DDEBUG. Default is debug messages to be disabled.
+	  To enable them, one writes a non-zero value to /proc/sys/fs/ntfs-debug
+	  (if /proc is enabled) or uses sysctl(2) to effect the same (if sysctl
+	  interface is enabled). Inspired by old ntfs driver.
+	- Add debug_msgs insmod/kernel boot parameter to set whether debug
+	  messages are {dis,en}abled. This is useful to enable debug messages
+	  during ntfs initialization and is the only way to activate debugging
+	  when the sysctl interface is not enabled.
+	- Cleanup debug output in various places.
+	- Remove all dollar signs ($) from the source (except comments) to
+	  enable compilation on architectures whose gcc compiler does not
+	  support dollar signs in the names of variables/constants. Attribute
+	  types now start with AT_ instead of $ and $I30 is now just I30.
+	- Cleanup ntfs_lookup() and add consistency check of sequence numbers.
+	- Load complete run list for $MFT/$BITMAP during mount and cleanup
+	  access functions. This means we now cope with $MFT/$BITMAP being
+	  spread accross several mft records.
+	- Disable modification of mft_zone_multiplier on remount. We can always
+	  reenable this later on if we really want to, but we will need to make
+	  sure we readjust the mft_zone size / layout accordingly.
+
+tng-0.0.5 - Modernize for 2.5.x and further in line-ing with Al Viro's comments.
+
+	- Use sb_set_blocksize() instead of set_blocksize() and verify the
+	  return value.
+	- Use sb_bread() instead of bread() throughout.
+	- Add index_vcn_size{_bits} to ntfs_inode structure to store the size
+	  of a directory index block vcn. Apply resulting simplifications in
+	  dir.c everywhere.
+	- Fix a small bug somewhere (but forgot what it was).
+	- Change ntfs_{debug,error,warning} to enable gcc to do type checking
+	  on the printf-format parameter list and fix bugs reported by gcc
+	  as a result. (Richard Russon)
+	- Move inode allocation strategy to Al's new stuff but maintain the
+	  divorce of ntfs_inode from struct inode. To achieve this we have two
+	  separate slab caches, one for big ntfs inodes containing a struct
+	  inode and pure ntfs inodes and at the same time fix some faulty
+	  error code paths in ntfs_read_inode().
+	- Show mount options in proc (inode.c::ntfs_show_options()).
+
+tng-0.0.4 - Big changes, getting in line with Al Viro's comments.
+
+	- Modified (un)map_mft_record functions to be common for read and write
+	  case. To specify which is which, added extra parameter at front of
+	  parameter list. Pass either READ or WRITE to this, each has the
+	  obvious meaning.
+	- General cleanups to allow for easier folding in vi.
+	- attrib.c::decompress_mapping_pairs() now accepts the old run list
+	  argument, and invokes attrib.c::merge_run_lists() to merge the old
+	  and the new run lists.
+	- Removed attrib.c::find_first_attr().
+	- Implemented loading of attribute list and complete run list for $MFT.
+	  This means we now cope with $MFT being spread across several mft
+	  records.
+	- Adapt to 2.5.2-pre9 and the changed create_empty_buffers() syntax.
+	- Adapt major/minor/kdev_t/[bk]devname stuff to new 2.5.x kernels.
+	- Make ntfs_volume be allocated via kmalloc() instead of using a slab
+	  cache. There are too little ntfs_volume structures at any one time
+	  to justify a private slab cache.
+	- Fix bogus kmap() use in async io completion. Now use kmap_atomic().
+	  Use KM_BIO_IRQ on advice from IRC/kernel...
+	- Use ntfs_map_page() in map_mft_record() and create ->readpage method
+	  for reading $MFT (ntfs_mft_readpage). In the process create dedicated
+	  address space operations (ntfs_mft_aops) for $MFT inode mapping. Also
+	  removed the now superfluous exports from the kernel core patch.
+	- Fix a bug where kfree() was used insted of ntfs_free().
+	- Change map_mft_record() to take ntfs_inode as argument instead of
+	  vfs inode. Dito for unmap_mft_record(). Adapt all callers.
+	- Add pointer to ntfs_volume to ntfs_inode.
+	- Add mft record number and sequence number to ntfs_inode. Stop using
+	  i_ino and i_generation for in-driver purposes.
+	- Implement attrib.c::merge_run_lists(). (Richard Russon)
+	- Remove use of proper inodes by extent inodes. Move i_ino and
+	  i_generation to ntfs_inode to do this. Apply simplifications that
+	  result and remove iget_no_wait(), etc.
+	- Pass ntfs_inode everywhere in the driver (used to be struct inode).
+	- Add reference counting in ntfs_inode for the ntfs inode itself and
+	  for the mapped mft record.
+	- Extend mft record mapping so we can (un)map extent mft records (new
+	  functions (un)map_extent_mft_record), and so mappings are reference
+	  counted and don't have to happen twice if already mapped - just ref
+	  count increases.
+	- Add -o iocharset as alias to -o nls for backwards compatibility.
+	- The latest core patch is now tiny. In fact just a single additional
+	  export is necessary over the base kernel.
+
+tng-0.0.3 - Cleanups, enhancements, bug fixes.
+
+	- Work on attrib.c::decompress_mapping_pairs() to detect base extents
+	  and setup the run list appropriately using knowledge provided by the
+	  sizes in the base attribute record.
+	- Balance the get_/put_attr_search_ctx() calls so we don't leak memory
+	  any more.
+	- Introduce ntfs_malloc_nofs() and ntfs_free() to allocate/free a single
+	  page or use vmalloc depending on the amount of memory requested.
+	- Cleanup error output. The __FUNCTION__ "(): " is now added
+	  automatically. Introduced a new header file debug.h to support this
+	  and also moved ntfs_debug() function into it.
+	- Make reading of compressed files more intelligent and especially get
+	  rid of the vmalloc_nofs() from readpage(). This now uses per CPU
+	  buffers (allocated at first mount with cluster size <= 4kiB and
+	  deallocated on last umount with cluster size <= 4kiB), and
+	  asynchronous io for the compressed data using a list of buffer heads.
+	  Er, we use synchronous io as async io only works on whole pages
+	  covered by buffers and not on individual buffer heads...
+	- Bug fix for reading compressed files with sparse compression blocks.
+
+tng-0.0.2 - Now handles larger/fragmented/compressed volumes/files/dirs.
+
+	- Fixed handling of directories when cluster size exceeds index block
+	  size.
+	- Hide DOS only name space directory entries from readdir() but allow
+	  them in lookup(). This should fix the problem that Linux doesn't
+	  support directory hard links, while still allowing access to entries
+	  via their short file name. This also has the benefit of mimicking
+	  what Windows users are used to, so it is the ideal solution.
+	- Implemented sync_page everywhere so no more hangs in D state when
+	  waiting for a page.
+	- Stop using bforget() in favour of brelse().
+	- Stop locking buffers unnecessarily.
+	- Implemented compressed files (inode->mapping contains uncompressed
+	  data, raw compressed data is currently bread() into a vmalloc()ed
+	  memory buffer).
+	- Enable compressed directories. (Their index root is marked compressed
+	  to indicate that new files in that directory should be created
+	  compressed.)
+	- Use vsnprintf rather than vsprintf in the ntfs_error and ntfs_warning
+	  functions. (Thanks to Will Dyson for pointing this out.)
+	- Moved the ntfs_inode and ntfs_volume (the former ntfs_inode_info and
+	  ntfs_sb_info) out of the common inode and super_block structures and
+	  started using the generic_ip and generic_sbp pointers instead. This
+	  makes ntfs entirely private with respect to the kernel tree.
+	- Detect compiler version and abort with error message if gcc less than
+	  2.96 is used.
+	- Fix bug in name comparison function in unistr.c.
+	- Implement attribute lists part 1, the infrastructure: search contexts
+	  and operations, find_external_attr(), lookup_attr()) and make the
+	  code use the infrastructure.
+	- Fix stupid buffer overflow bug that became apparent on larger run
+	  list containing attributes.
+	- Fix bugs in readdir() that became apparent on larger directories.
+
+	The driver is now really useful and survives the test
+		find . -type f -exec md5sum "{}" \;
+	without any error messages on a over 1GiB sized partition with >16k
+	files on it, including compressed files and directories and many files
+	and directories with attribute lists.
+
+tng-0.0.1 - The first useful version.
+
+	- Added ntfs_lookup().
+	- Added default upcase generation and handling.
+	- Added compile options to be shown on module init.
+	- Many bug fixes that were "hidden" before.
+	- Update to latest kernel.
+	- Added ntfs_readdir().
+	- Added file operations for mmap(), read(), open() and llseek(). We just
+	  use the generic ones. The whole point of going through implementing
+	  readpage() methods and where possible get_block() call backs is that
+	  this allows us to make use of the generic high level methods provided
+	  by the kernel.
+
+	The driver is now actually useful! Yey. (-: It undoubtedly has got bugs
+	though and it doesn't implement accesssing compressed files yet. Also,
+	accessing files with attribute list attributes is not implemented yet
+	either. But for small or simple file systems it should work and allow
+	you to list directories, use stat on directory entries and the file
+	system, open, read, mmap and llseek around in files. A big mile stone
+	has been reached!
+
+tng-0.0.0 - Initial version tag.
+
+	Initial driver implementation. The driver can mount and umount simple
+	NTFS file systems (i.e. ones without attribute lists in the system
+	files). If the mount fails there might be problems in the error handling
+	code paths, so be warned. Otherwise it seems to be loading the system
+	files nicely and the mft record read mapping/unmapping seems to be
+	working nicely, too. Proof of inode metadata in the page cache and non-
+	resident file unnamed stream data in the page cache concepts is thus
+	complete.
+
diff -Nur linux/fs/ntfs/Makefile linux-2.4.18-ntfs-2.0.6a/fs/ntfs/Makefile
--- linux/fs/ntfs/Makefile	Mon Feb 25 20:38:09 2002
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/Makefile	Mon May  6 23:16:24 2002
@@ -1,11 +1,17 @@
-# Rules for making the NTFS driver
+# Rules for making the NTFS driver.
 
 O_TARGET := ntfs.o
 
-obj-y   := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o unistr.o
+obj-y   := aops.o attrib.o compress.o debug.o dir.o file.o inode.o mft.o \
+		mst.o namei.o super.o sysctl.o time.o unistr.o upcase.o
+
 obj-m   := $(O_TARGET)
-# New version format started 3 February 2001.
-EXTRA_CFLAGS = -DNTFS_VERSION=\"1.1.22\" #-DDEBUG
+
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.0.6a\"
+
+ifeq ($(CONFIG_NTFS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
 
 include $(TOPDIR)/Rules.make
 
diff -Nur linux/fs/ntfs/aops.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/aops.c
--- linux/fs/ntfs/aops.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/aops.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,809 @@
+/**
+ * aops.c - NTFS kernel address space operations and page cache handling.
+ * 	    Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/errno.h>
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+#include <linux/swap.h>
+#include <linux/locks.h>
+
+#include "ntfs.h"
+
+#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)
+
+#define page_buffers(page)	(page)->buffers
+
+/**
+ * end_buffer_read_file_async -
+ *
+ * Async io completion handler for accessing files. Adapted from
+ * end_buffer_read_mst_async().
+ */
+static void end_buffer_read_file_async(struct buffer_head *bh, int uptodate)
+{
+	static spinlock_t page_uptodate_lock = SPIN_LOCK_UNLOCKED;
+	unsigned long flags;
+	struct buffer_head *tmp;
+	struct page *page;
+
+	mark_buffer_uptodate(bh, uptodate);
+
+	page = bh->b_page;
+
+	if (likely(uptodate)) {
+		s64 file_ofs;
+
+		ntfs_inode *ni = NTFS_I(page->mapping->host);
+
+		file_ofs = (page->index << PAGE_CACHE_SHIFT) + bh_offset(bh);
+		if (file_ofs + bh->b_size > ni->initialized_size) {
+			char *addr;
+			int ofs = 0;
+
+			if (file_ofs < ni->initialized_size)
+				ofs = ni->initialized_size - file_ofs;
+			addr = kmap_atomic(page, KM_BIO_IRQ);
+			memset(addr + bh_offset(bh) + ofs, 0, bh->b_size - ofs);
+			flush_dcache_page(page);
+			kunmap_atomic(addr, KM_BIO_IRQ);
+		}
+	} else
+		SetPageError(page);
+
+	spin_lock_irqsave(&page_uptodate_lock, flags);
+	mark_buffer_async(bh, 0);
+	unlock_buffer(bh);
+
+	tmp = bh->b_this_page;
+	while (tmp != bh) {
+		if (buffer_locked(tmp)) {
+			if (buffer_async(tmp))
+				goto still_busy;
+		} else if (!buffer_uptodate(tmp))
+			SetPageError(page);
+		tmp = tmp->b_this_page;
+	}
+
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	if (!PageError(page))
+		SetPageUptodate(page);
+	UnlockPage(page);
+	return;
+still_busy:
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	return;
+}
+
+/**
+ * ntfs_file_read_block -
+ *
+ * NTFS version of block_read_full_page(). Adapted from ntfs_mst_readpage().
+ */
+static int ntfs_file_read_block(struct page *page)
+{
+	VCN vcn;
+	LCN lcn;
+	ntfs_inode *ni;
+	ntfs_volume *vol;
+	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];
+	sector_t iblock, lblock, zblock;
+	unsigned int blocksize, blocks, vcn_ofs;
+	int i, nr;
+	unsigned char blocksize_bits;
+
+	ni = NTFS_I(page->mapping->host);
+	vol = ni->vol;
+
+	blocksize_bits = VFS_I(ni)->i_blkbits;
+	blocksize = 1 << blocksize_bits;
+
+	if (!page->buffers)
+		create_empty_buffers(page, VFS_I(ni)->i_dev, blocksize);
+	bh = head = page_buffers(page);
+	if (!bh)
+		return -ENOMEM;
+
+	blocks = PAGE_CACHE_SIZE >> blocksize_bits;
+	iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
+	lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits;
+	zblock = (ni->initialized_size + blocksize - 1) >> blocksize_bits;
+
+#ifdef DEBUG
+	if (unlikely(!ni->mft_no)) {
+		ntfs_error(vol->sb, "NTFS: Attempt to access $MFT! This is a "
+				"very serious bug! Denying access...");
+		return -EACCES;
+	}
+#endif
+
+	/* Loop through all the buffers in the page. */
+	nr = i = 0;
+	do {
+		if (unlikely(buffer_uptodate(bh)))
+			continue;
+		if (unlikely(buffer_mapped(bh))) {
+			arr[nr++] = bh;
+			continue;
+		}
+		bh->b_dev = VFS_I(ni)->i_dev;
+		/* Is the block within the allowed limits? */
+		if (iblock < lblock) {
+			BOOL is_retry = FALSE;
+
+			/* Convert iblock into corresponding vcn and offset. */
+			vcn = (VCN)iblock << blocksize_bits >>
+					vol->cluster_size_bits;
+			vcn_ofs = ((VCN)iblock << blocksize_bits) &
+					vol->cluster_size_mask;
+retry_remap:
+			/* Convert the vcn to the corresponding lcn. */
+			down_read(&ni->run_list.lock);
+			lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+			up_read(&ni->run_list.lock);
+			/* Successful remap. */
+			if (lcn >= 0) {
+				/* Setup buffer head to correct block. */
+				bh->b_blocknr = ((lcn << vol->cluster_size_bits)
+						+ vcn_ofs) >> blocksize_bits;
+				bh->b_state |= (1UL << BH_Mapped);
+				/* Only read initialized data blocks. */
+				if (iblock < zblock) {
+					arr[nr++] = bh;
+					continue;
+				}
+				/* Fully non-initialized data block, zero it. */
+				goto handle_zblock;
+			}
+			/* It is a hole, need to zero it. */
+			if (lcn == LCN_HOLE)
+				goto handle_hole;
+			/* If first try and run list unmapped, map and retry. */
+			if (!is_retry && lcn == LCN_RL_NOT_MAPPED) {
+				is_retry = TRUE;
+				if (!map_run_list(ni, vcn))
+					goto retry_remap;
+			}
+			/* Hard error, zero out region. */
+			SetPageError(page);
+			ntfs_error(vol->sb, "vcn_to_lcn(vcn = 0x%Lx) failed "
+					"with error code 0x%Lx%s.",
+					(long long)vcn, (long long)-lcn,
+					is_retry ? " even after retrying" : "");
+			// FIXME: Depending on vol->on_errors, do something.
+		}
+		/*
+		 * Either iblock was outside lblock limits or vcn_to_lcn()
+		 * returned error. Just zero that portion of the page and set
+		 * the buffer uptodate.
+		 */
+handle_hole:
+		bh->b_blocknr = -1UL;
+		bh->b_state &= ~(1UL << BH_Mapped);
+handle_zblock:
+		memset(kmap(page) + i * blocksize, 0, blocksize);
+		flush_dcache_page(page);
+		kunmap(page);
+		set_bit(BH_Uptodate, &bh->b_state);
+	} while (i++, iblock++, (bh = bh->b_this_page) != head);
+
+	/* Check we have at least one buffer ready for i/o. */
+	if (nr) {
+		/* Lock the buffers. */
+		for (i = 0; i < nr; i++) {
+			struct buffer_head *tbh = arr[i];
+			lock_buffer(tbh);
+			tbh->b_end_io = end_buffer_read_file_async;
+			mark_buffer_async(tbh, 1);
+		}
+		/* Finally, start i/o on the buffers. */
+		for (i = 0; i < nr; i++)
+			submit_bh(READ, arr[i]);
+		return 0;
+	}
+	/* No i/o was scheduled on any of the buffers. */
+	if (!PageError(page))
+		SetPageUptodate(page);
+	else /* Signal synchronous i/o error. */
+		nr = -EIO;
+	UnlockPage(page);
+	return nr;
+}
+
+/**
+ * ntfs_file_readpage - fill a @page of a @file with data from the device
+ * @file:	open file to which the page @page belongs or NULL
+ * @page:	page cache page to fill with data
+ *
+ * For non-resident attributes, ntfs_file_readpage() fills the @page of the open
+ * file @file by calling the generic block_read_full_page() function provided by
+ * the kernel which in turn invokes our ntfs_file_get_block() callback in order
+ * to create and read in the buffers associated with the page asynchronously.
+ *
+ * For resident attributes, OTOH, ntfs_file_readpage() fills @page by copying
+ * the data from the mft record (which at this stage is most likely in memory)
+ * and fills the remainder with zeroes. Thus, in this case I/O is synchronous,
+ * as even if the mft record is not cached at this point in time, we need to
+ * wait for it to be read in before we can do the copy.
+ *
+ * Return zero on success or -errno on error.
+ */
+static int ntfs_file_readpage(struct file *file, struct page *page)
+{
+	s64 attr_pos;
+	ntfs_inode *ni;
+	char *addr;
+	attr_search_context *ctx;
+	MFT_RECORD *mrec;
+	u32 attr_len;
+	int err = 0;
+
+	if (!PageLocked(page))
+		PAGE_BUG(page);
+
+	ni = NTFS_I(page->mapping->host);
+
+	/* Is the unnamed $DATA attribute resident? */
+	if (test_bit(NI_NonResident, &ni->state)) {
+		/* Attribute is not resident. */
+
+		/* If the file is encrypted, we deny access, just like NT4. */
+		if (test_bit(NI_Encrypted, &ni->state)) {
+			err = -EACCES;
+			goto unl_err_out;
+		}
+		/* Compressed data stream. Handled in compress.c. */
+		if (test_bit(NI_Compressed, &ni->state))
+			return ntfs_file_read_compressed_block(page);
+		/* Normal data stream. */
+		return ntfs_file_read_block(page);
+	}
+	/* Attribute is resident, implying it is not compressed or encrypted. */
+
+	/* Map, pin and lock the mft record for reading. */
+	mrec = map_mft_record(READ, ni);
+	if (IS_ERR(mrec)) {
+		err = PTR_ERR(mrec);
+		goto unl_err_out;
+	}
+
+	ctx = get_attr_search_ctx(ni, mrec);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto unm_unl_err_out;
+	}
+
+	/* Find the data attribute in the mft record. */
+	if (!lookup_attr(AT_DATA, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		err = -ENOENT;
+		goto put_unm_unl_err_out;
+	}
+
+	/* Starting position of the page within the attribute value. */
+	attr_pos = page->index << PAGE_CACHE_SHIFT;
+
+	/* The total length of the attribute value. */
+	attr_len = le32_to_cpu(ctx->attr->_ARA(value_length));
+
+	addr = kmap(page);
+	/* Copy over in bounds data, zeroing the remainder of the page. */
+	if (attr_pos < attr_len) {
+		u32 bytes = attr_len - attr_pos;
+		if (bytes > PAGE_CACHE_SIZE)
+			bytes = PAGE_CACHE_SIZE;
+		else if (bytes < PAGE_CACHE_SIZE)
+			memset(addr + bytes, 0, PAGE_CACHE_SIZE - bytes);
+		/* Copy the data to the page. */
+		memcpy(addr, attr_pos + (char*)ctx->attr +
+				le16_to_cpu(ctx->attr->_ARA(value_offset)),
+				bytes);
+	} else
+		memset(addr, 0, PAGE_CACHE_SIZE);
+	flush_dcache_page(page);
+	kunmap(page);
+
+	SetPageUptodate(page);
+put_unm_unl_err_out:
+	put_attr_search_ctx(ctx);
+unm_unl_err_out:
+	unmap_mft_record(READ, ni);
+unl_err_out:
+	UnlockPage(page);
+	return err;
+}
+
+/**
+ * end_buffer_read_mftbmp_async -
+ *
+ * Async io completion handler for accessing mft bitmap. Adapted from
+ * end_buffer_read_mst_async().
+ */
+static void end_buffer_read_mftbmp_async(struct buffer_head *bh, int uptodate)
+{
+	static spinlock_t page_uptodate_lock = SPIN_LOCK_UNLOCKED;
+	unsigned long flags;
+	struct buffer_head *tmp;
+	struct page *page;
+
+	mark_buffer_uptodate(bh, uptodate);
+
+	page = bh->b_page;
+
+	if (likely(uptodate)) {
+		s64 file_ofs;
+
+		/* Host is the ntfs volume. Our mft bitmap access kludge... */
+		ntfs_volume *vol = (ntfs_volume*)page->mapping->host;
+
+		file_ofs = (page->index << PAGE_CACHE_SHIFT) + bh_offset(bh);
+		if (file_ofs + bh->b_size > vol->mftbmp_initialized_size) {
+			char *addr;
+			int ofs = 0;
+
+			if (file_ofs < vol->mftbmp_initialized_size)
+				ofs = vol->mftbmp_initialized_size - file_ofs;
+			addr = kmap_atomic(page, KM_BIO_IRQ);
+			memset(addr + bh_offset(bh) + ofs, 0, bh->b_size - ofs);
+			flush_dcache_page(page);
+			kunmap_atomic(addr, KM_BIO_IRQ);
+		}
+	} else
+		SetPageError(page);
+
+	spin_lock_irqsave(&page_uptodate_lock, flags);
+	mark_buffer_async(bh, 0);
+	unlock_buffer(bh);
+
+	tmp = bh->b_this_page;
+	while (tmp != bh) {
+		if (buffer_locked(tmp)) {
+			if (buffer_async(tmp))
+				goto still_busy;
+		} else if (!buffer_uptodate(tmp))
+			SetPageError(page);
+		tmp = tmp->b_this_page;
+	}
+
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	if (!PageError(page))
+		SetPageUptodate(page);
+	UnlockPage(page);
+	return;
+still_busy:
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	return;
+}
+
+/**
+ * ntfs_mftbmp_readpage -
+ *
+ * Readpage for accessing mft bitmap. Adapted from ntfs_mst_readpage().
+ */
+static int ntfs_mftbmp_readpage(ntfs_volume *vol, struct page *page)
+{
+	VCN vcn;
+	LCN lcn;
+	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];
+	sector_t iblock, lblock, zblock;
+	unsigned int blocksize, blocks, vcn_ofs;
+	int nr, i;
+	unsigned char blocksize_bits;
+
+	if (!PageLocked(page))
+		PAGE_BUG(page);
+
+	blocksize = vol->sb->s_blocksize;
+	blocksize_bits = vol->sb->s_blocksize_bits;
+
+	if (!page->buffers)
+		create_empty_buffers(page, vol->mft_ino->i_dev, blocksize);
+	bh = head = page_buffers(page);
+	if (!bh)
+		return -ENOMEM;
+
+	blocks = PAGE_CACHE_SIZE >> blocksize_bits;
+	iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
+	lblock = (vol->mftbmp_allocated_size + blocksize - 1) >> blocksize_bits;
+	zblock = (vol->mftbmp_initialized_size + blocksize - 1) >>
+			blocksize_bits;
+
+	/* Loop through all the buffers in the page. */
+	nr = i = 0;
+	do {
+		if (unlikely(buffer_uptodate(bh)))
+			continue;
+		if (unlikely(buffer_mapped(bh))) {
+			arr[nr++] = bh;
+			continue;
+		}
+		bh->b_dev = vol->mft_ino->i_dev;
+		/* Is the block within the allowed limits? */
+		if (iblock < lblock) {
+			/* Convert iblock into corresponding vcn and offset. */
+			vcn = (VCN)iblock << blocksize_bits >>
+					vol->cluster_size_bits;
+			vcn_ofs = ((VCN)iblock << blocksize_bits) &
+					vol->cluster_size_mask;
+			/* Convert the vcn to the corresponding lcn. */
+			down_read(&vol->mftbmp_rl.lock);
+			lcn = vcn_to_lcn(vol->mftbmp_rl.rl, vcn);
+			up_read(&vol->mftbmp_rl.lock);
+			/* Successful remap. */
+			if (lcn >= 0) {
+				/* Setup buffer head to correct block. */
+				bh->b_blocknr = ((lcn << vol->cluster_size_bits)
+						+ vcn_ofs) >> blocksize_bits;
+				bh->b_state |= (1UL << BH_Mapped);
+				/* Only read initialized data blocks. */
+				if (iblock < zblock) {
+					arr[nr++] = bh;
+					continue;
+				}
+				/* Fully non-initialized data block, zero it. */
+				goto handle_zblock;
+			}
+			if (lcn != LCN_HOLE) {
+				/* Hard error, zero out region. */
+				SetPageError(page);
+				ntfs_error(vol->sb, "vcn_to_lcn(vcn = 0x%Lx) "
+						"failed with error code "
+						"0x%Lx.", (long long)vcn,
+						(long long)-lcn);
+				// FIXME: Depending on vol->on_errors, do
+				// something.
+			}
+		}
+		/*
+		 * Either iblock was outside lblock limits or vcn_to_lcn()
+		 * returned error. Just zero that portion of the page and set
+		 * the buffer uptodate.
+		 */
+		bh->b_blocknr = -1UL;
+		bh->b_state &= ~(1UL << BH_Mapped);
+handle_zblock:
+		memset(kmap(page) + i * blocksize, 0, blocksize);
+		flush_dcache_page(page);
+		kunmap(page);
+		set_bit(BH_Uptodate, &bh->b_state);
+	} while (i++, iblock++, (bh = bh->b_this_page) != head);
+
+	/* Check we have at least one buffer ready for i/o. */
+	if (nr) {
+		/* Lock the buffers. */
+		for (i = 0; i < nr; i++) {
+			struct buffer_head *tbh = arr[i];
+			lock_buffer(tbh);
+			tbh->b_end_io = end_buffer_read_mftbmp_async;
+			mark_buffer_async(tbh, 1);
+		}
+		/* Finally, start i/o on the buffers. */
+		for (i = 0; i < nr; i++)
+			submit_bh(READ, arr[i]);
+		return 0;
+	}
+	/* No i/o was scheduled on any of the buffers. */
+	if (!PageError(page))
+		SetPageUptodate(page);
+	else /* Signal synchronous i/o error. */
+		nr = -EIO;
+	UnlockPage(page);
+	return nr;
+}
+
+/**
+ * end_buffer_read_mst_async - async io completion for reading index records
+ * @bh:		buffer head on which io is completed
+ * @uptodate:	whether @bh is now uptodate or not
+ *
+ * Asynchronous I/O completion handler for reading pages belonging to the
+ * index allocation attribute address space of directory inodes.
+ *
+ * Perform the post read mst fixups when all IO on the page has been completed
+ * and marks the page uptodate or sets the error bit on the page.
+ *
+ * Adapted from fs/buffer.c.
+ *
+ * NOTE: We use this function as async io completion handler for reading pages
+ * belonging to the mft data attribute address space, too as this saves
+ * duplicating an almost identical function. We do this by cheating a little
+ * bit in setting the index_block_size in the mft ntfs_inode to the mft record
+ * size of the volume (vol->mft_record_size), and index_block_size_bits to
+ * mft_record_size_bits, respectively.
+ */
+static void end_buffer_read_mst_async(struct buffer_head *bh, int uptodate)
+{
+	static spinlock_t page_uptodate_lock = SPIN_LOCK_UNLOCKED;
+	unsigned long flags;
+	struct buffer_head *tmp;
+	struct page *page;
+	ntfs_inode *ni;
+
+	mark_buffer_uptodate(bh, uptodate);
+
+	page = bh->b_page;
+
+	ni = NTFS_I(page->mapping->host);
+
+	if (likely(uptodate)) {
+		s64 file_ofs;
+
+		file_ofs = (page->index << PAGE_CACHE_SHIFT) + bh_offset(bh);
+		/* Check for the current buffer head overflowing. */
+		if (file_ofs + bh->b_size > ni->initialized_size) {
+			char *addr;
+			int ofs = 0;
+
+			if (file_ofs < ni->initialized_size)
+				ofs = ni->initialized_size - file_ofs;
+			addr = kmap_atomic(page, KM_BIO_IRQ);
+			memset(addr + bh_offset(bh) + ofs, 0, bh->b_size - ofs);
+			flush_dcache_page(page);
+			kunmap_atomic(addr, KM_BIO_IRQ);
+		}
+	} else
+		SetPageError(page);
+
+	spin_lock_irqsave(&page_uptodate_lock, flags);
+	mark_buffer_async(bh, 0);
+	unlock_buffer(bh);
+
+	tmp = bh->b_this_page;
+	while (tmp != bh) {
+		if (buffer_locked(tmp)) {
+			if (buffer_async(tmp))
+				goto still_busy;
+		} else if (!buffer_uptodate(tmp))
+			SetPageError(page);
+		tmp = tmp->b_this_page;
+	}
+
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	/*
+	 * If none of the buffers had errors then we can set the page uptodate,
+	 * but we first have to perform the post read mst fixups.
+	 */
+	if (!PageError(page)) {
+		char *addr;
+		unsigned int i, recs, nr_err = 0;
+		u32 rec_size;
+
+		rec_size = ni->_IDM(index_block_size);
+		recs = PAGE_CACHE_SIZE / rec_size;
+		addr = kmap_atomic(page, KM_BIO_IRQ);
+		for (i = 0; i < recs; i++) {
+			if (!post_read_mst_fixup((NTFS_RECORD*)(addr +
+					i * rec_size), rec_size))
+				continue;
+			nr_err++;
+			ntfs_error(ni->vol->sb, "post_read_mst_fixup() failed, "
+					"corrupt %s record 0x%Lx. Run chkdsk.",
+					ni->mft_no ? "index" : "mft",
+					(long long)((page->index <<
+					PAGE_CACHE_SHIFT >>
+					ni->_IDM(index_block_size_bits)) + i));
+		}
+		flush_dcache_page(page);
+		kunmap_atomic(addr, KM_BIO_IRQ);
+		if (likely(!nr_err && recs))
+			SetPageUptodate(page);
+		else {
+			ntfs_error(ni->vol->sb, "Setting page error, index "
+					"0x%lx.", page->index);
+			SetPageError(page);
+		}
+	}
+	UnlockPage(page);
+	return;
+still_busy:
+	spin_unlock_irqrestore(&page_uptodate_lock, flags);
+	return;
+}
+
+/**
+ * ntfs_mst_readpage - fill a @page of the mft or a directory with data
+ * @file:	open file/directory to which the page @page belongs or NULL
+ * @page:	page cache page to fill with data
+ *
+ * Readpage method for the VFS address space operations.
+ *
+ * Fill the page @page of the $MFT or the open directory @dir. We read each
+ * buffer asynchronously and when all buffers are read in our io completion
+ * handler end_buffer_read_mst_async() automatically applies the mst fixups to
+ * the page before finally marking it uptodate and unlocking it.
+ *
+ * Contains an adapted version of fs/buffer.c::block_read_full_page().
+ */
+int ntfs_mst_readpage(struct file *dir, struct page *page)
+{
+	VCN vcn;
+	LCN lcn;
+	ntfs_inode *ni;
+	ntfs_volume *vol;
+	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];
+	sector_t iblock, lblock, zblock;
+	unsigned int blocksize, blocks, vcn_ofs;
+	int i, nr;
+	unsigned char blocksize_bits;
+
+	if (!PageLocked(page))
+		PAGE_BUG(page);
+
+	ni = NTFS_I(page->mapping->host);
+	vol = ni->vol;
+
+	blocksize_bits = VFS_I(ni)->i_blkbits;
+	blocksize = 1 << blocksize_bits;
+
+	if (!page->buffers)
+		create_empty_buffers(page, VFS_I(ni)->i_dev, blocksize);
+	bh = head = page_buffers(page);
+	if (!bh)
+		return -ENOMEM;
+
+	blocks = PAGE_CACHE_SIZE >> blocksize_bits;
+	iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
+	lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits;
+	zblock = (ni->initialized_size + blocksize - 1) >> blocksize_bits;
+
+#ifdef DEBUG
+	if (unlikely(!ni->run_list.rl && !ni->mft_no))
+		panic("NTFS: $MFT/$DATA run list has been unmapped! This is a "
+				"very serious bug! Cannot continue...");
+#endif
+
+	/* Loop through all the buffers in the page. */
+	nr = i = 0;
+	do {
+		if (unlikely(buffer_uptodate(bh)))
+			continue;
+		if (unlikely(buffer_mapped(bh))) {
+			arr[nr++] = bh;
+			continue;
+		}
+		bh->b_dev = VFS_I(ni)->i_dev;
+		/* Is the block within the allowed limits? */
+		if (iblock < lblock) {
+			BOOL is_retry = FALSE;
+
+			/* Convert iblock into corresponding vcn and offset. */
+			vcn = (VCN)iblock << blocksize_bits >>
+					vol->cluster_size_bits;
+			vcn_ofs = ((VCN)iblock << blocksize_bits) &
+					vol->cluster_size_mask;
+retry_remap:
+			/* Convert the vcn to the corresponding lcn. */
+			down_read(&ni->run_list.lock);
+			lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+			up_read(&ni->run_list.lock);
+			/* Successful remap. */
+			if (lcn >= 0) {
+				/* Setup buffer head to correct block. */
+				bh->b_blocknr = ((lcn << vol->cluster_size_bits)
+						+ vcn_ofs) >> blocksize_bits;
+				bh->b_state |= (1UL << BH_Mapped);
+				/* Only read initialized data blocks. */
+				if (iblock < zblock) {
+					arr[nr++] = bh;
+					continue;
+				}
+				/* Fully non-initialized data block, zero it. */
+				goto handle_zblock;
+			}
+			/* It is a hole, need to zero it. */
+			if (lcn == LCN_HOLE)
+				goto handle_hole;
+			/* If first try and run list unmapped, map and retry. */
+			if (!is_retry && lcn == LCN_RL_NOT_MAPPED) {
+				is_retry = TRUE;
+				if (!map_run_list(ni, vcn))
+					goto retry_remap;
+			}
+			/* Hard error, zero out region. */
+			SetPageError(page);
+			ntfs_error(vol->sb, "vcn_to_lcn(vcn = 0x%Lx) failed "
+					"with error code 0x%Lx%s.",
+					(long long)vcn, (long long)-lcn,
+					is_retry ? " even after retrying" : "");
+			// FIXME: Depending on vol->on_errors, do something.
+		}
+		/*
+		 * Either iblock was outside lblock limits or vcn_to_lcn()
+		 * returned error. Just zero that portion of the page and set
+		 * the buffer uptodate.
+		 */
+handle_hole:
+		bh->b_blocknr = -1UL;
+		bh->b_state &= ~(1UL << BH_Mapped);
+handle_zblock:
+		memset(kmap(page) + i * blocksize, 0, blocksize);
+		flush_dcache_page(page);
+		kunmap(page);
+		set_bit(BH_Uptodate, &bh->b_state);
+	} while (i++, iblock++, (bh = bh->b_this_page) != head);
+
+	/* Check we have at least one buffer ready for i/o. */
+	if (nr) {
+		/* Lock the buffers. */
+		for (i = 0; i < nr; i++) {
+			struct buffer_head *tbh = arr[i];
+			lock_buffer(tbh);
+			tbh->b_end_io = end_buffer_read_mst_async;
+			mark_buffer_async(tbh, 1);
+		}
+		/* Finally, start i/o on the buffers. */
+		for (i = 0; i < nr; i++)
+			submit_bh(READ, arr[i]);
+		return 0;
+	}
+	/* No i/o was scheduled on any of the buffers. */
+	if (!PageError(page))
+		SetPageUptodate(page);
+	else /* Signal synchronous i/o error. */
+		nr = -EIO;
+	UnlockPage(page);
+	return nr;
+}
+
+/**
+ * ntfs_file_aops - address space operations for accessing normal file data
+ */
+struct address_space_operations ntfs_file_aops = {
+	writepage:	NULL,			/* Write dirty page to disk. */
+	readpage:	ntfs_file_readpage,	/* Fill page with data. */
+	sync_page:	block_sync_page,	/* Currently, just unplugs the
+						   disk request queue. */
+	prepare_write:	NULL,			/* . */
+	commit_write:	NULL,			/* . */
+};
+
+typedef int readpage_t(struct file *, struct page *);
+
+/**
+ * ntfs_mftbmp_aops - address space operations for accessing mftbmp
+ */
+struct address_space_operations ntfs_mftbmp_aops = {
+	writepage:	NULL,			/* Write dirty page to disk. */
+	readpage:	(readpage_t*)ntfs_mftbmp_readpage, /* Fill page with
+							      data. */
+	sync_page:	block_sync_page,	/* Currently, just unplugs the
+						   disk request queue. */
+	prepare_write:	NULL,			/* . */
+	commit_write:	NULL,			/* . */
+};
+
+/**
+ * ntfs_dir_aops -
+ *
+ * Address space operations for accessing normal directory data (i.e. index
+ * allocation attribute). We can't just use the same operations as for files
+ * because 1) the attribute is different and even more importantly 2) the index
+ * records have to be multi sector transfer deprotected (i.e. fixed-up).
+ */
+struct address_space_operations ntfs_dir_aops = {
+	writepage:	NULL,			/* Write dirty page to disk. */
+	readpage:	ntfs_mst_readpage,	/* Fill page with data. */
+	sync_page:	block_sync_page,	/* Currently, just unplugs the
+						   disk request queue. */
+	prepare_write:	NULL,			/* . */
+	commit_write:	NULL,			/* . */
+};
+
diff -Nur linux/fs/ntfs/attr.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attr.c
--- linux/fs/ntfs/attr.c	Fri Dec 21 18:42:03 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attr.c	Thu Jan  1 01:00:00 1970
@@ -1,872 +0,0 @@
-/*
- * attr.c
- *
- * Copyright (C) 1996-1999 Martin von Löwis
- * Copyright (C) 1996-1997 Régis Duchesne
- * Copyright (C) 1998 Joseph Malicki
- * Copyright (C) 1999 Steve Dodd
- * Copyright (C) 2001 Anton Altaparmakov (AIA)
- */
-
-#include "ntfstypes.h"
-#include "struct.h"
-#include "attr.h"
-
-#include <linux/errno.h>
-#include <linux/ntfs_fs.h>
-#include "macros.h"
-#include "support.h"
-#include "util.h"
-#include "super.h"
-#include "inode.h"
-#include "unistr.h"
-
-/**
- * ntfs_find_attr_in_mft_rec - find attribute in mft record
- * @vol:	volume on which attr resides
- * @m:		mft record to search
- * @type:	attribute type to find
- * @name:	attribute name to find (optional, i.e. NULL means don't care)
- * @name_len:	attribute name length (only needed if @name present)
- * @ic:		ignore case if 1 or case sensitive if 0 (ignored if @name NULL)
- * @instance:	instance number to find
- *
- * Only search the specified mft record and it ignores the presence of an
- * attribute list attribute (unless it is the one being searched for,
- * obviously, in which case it is returned).
- */
-ntfs_u8* ntfs_find_attr_in_mft_rec(ntfs_volume *vol, ntfs_u8 *m, __u32 type,
-		wchar_t *name, __u32 name_len, int ic, __u16 instance)
-{
-	ntfs_u8 *a;
-	
-	/* Iterate over attributes in mft record @m. */
-	a = m + NTFS_GETU16(m + 20);	/* attrs_offset */
-	for (; a >= m && a <= m + vol->mft_record_size;
-				a += NTFS_GETU32(a + 4 /* length */)) {
-		/* We catch $END with this more general check, too... */
-		if (NTFS_GETU32(a + 0 /* type */) > type)
-			return NULL;
-		if (!NTFS_GETU32(a + 4 /* length */))
-			break;
-		if (NTFS_GETU32(a + 0 /* type */) != type)
-			continue;
-		/* If @name is present, compare the two names. */
-		if (name && !ntfs_are_names_equal(name, name_len, (wchar_t*)
-				(a + NTFS_GETU16(a + 10 /* name_offset */)),
-				a[9] /* name_length */, ic, vol->upcase,
-				vol->upcase_length)) {
-			register int rc;
-			
-			rc = ntfs_collate_names(vol->upcase, vol->upcase_length,
-					name, name_len, (wchar_t*)(a +
-					NTFS_GETU16(a + 10 /* name_offset */)),
-					a[9] /* name_length */, 1, 1);
-			/*
-			 * If @name collates before a->name, there is no
-			 * matching attribute.
-			 */
-			if (rc == -1)
-				return NULL;
-			/* If the strings are not equal, continue search. */
-			if (rc)
-	 			continue;
-			rc = ntfs_collate_names(vol->upcase, vol->upcase_length,
-					name, name_len, (wchar_t*)(a +
-					NTFS_GETU16(a + 10 /* name_offset */)),
-					a[9] /* name_length */, 0, 1);
-			if (rc == -1)
-				return NULL;
-			if (rc)
-				continue;
-		}
-		/*
-		 * The names match or @name not present. Check instance number.
-		 * and if it matches we have found the attribute and are done.
-		 */
-		if (instance != NTFS_GETU16(a + 14 /* instance */))
-			continue;
-		ntfs_debug(DEBUG_FILE3, "ntfs_find_attr_in_mft_record: found: "
-			"attr type 0x%x, instance number = 0x%x.\n",
-			NTFS_GETU32(a + 0), instance);
-		return a;
-	}
-	ntfs_error("ntfs_find_attr_in_mft_record: mft record 0x%x is corrupt"
-			". Run chkdsk.\n", m);
-	return NULL;
-}
-
-/* Look if an attribute already exists in the inode, and if not, create it. */
-int ntfs_new_attr(ntfs_inode *ino, int type, void *name, int namelen,
-		  void *value, int value_len, int *pos, int *found)
-{
-	int do_insert = 0;
-	int i, m;
-	ntfs_attribute *a;
-
-	for (i = 0; i < ino->attr_count; i++)
-	{
-		a = ino->attrs + i;
-		if (a->type < type)
-			continue;
-		if (a->type > type) {
-			do_insert = 1;
-			break;
-		}
-		/* If @name is present, compare the two names. */
-		if (namelen && !ntfs_are_names_equal((wchar_t*)name, namelen,
-				a->name, a->namelen /* name_length */,
-				1 /* ignore case*/, ino->vol->upcase,
-				ino->vol->upcase_length)) {
-			register int rc;
-
-			rc = ntfs_collate_names(ino->vol->upcase,
-					ino->vol->upcase_length, a->name,
-					a->namelen, (wchar_t*)name, namelen,
-					1 /* ignore case */, 1);
-			if (rc == -1)
-				continue;
-			if (rc == 1) {
-	 			do_insert = 1;
-				break;
-			}
-			rc = ntfs_collate_names(ino->vol->upcase,
-					ino->vol->upcase_length, a->name,
-					a->namelen, (wchar_t*)name, namelen,
-					0 /* case sensitive */, 1);
-			if (rc == -1)
-				continue;
-			if (rc == 1) {
-				do_insert = 1;
-				break;
-			}
-		}
-		/* Names are equal or no name was asked for. */
-		/* If a value was specified compare the values. */
-		if (value_len && a->resident) {
-			if (!a->resident) {
-				ntfs_error("ntfs_new_attr: Value specified but "
-					"attribute non-resident. Bug!\n");
-				return -EINVAL;
-			}
-			m = value_len;
-			if (m > a->size)
-				m = a->size;
-			m = memcmp(value, a->d.data, m);
-			if (m > 0)
-				continue;
-			if (m < 0) {
-				do_insert = 1;
-				break;
-			}
-			/* Values match until min of value lengths. */
-			if (value_len > a->size)
-				continue;
-			if (value_len < a->size) {
-				do_insert = 1;
-				break;
-			}
-		}
-		/* Full match! */
-		*found = 1;
-		*pos = i;
-		return 0;
-	}
-	/* Re-allocate space. */
-	if (ino->attr_count % 8 == 0)
-	{
-		ntfs_attribute* new;
-		new = (ntfs_attribute*)ntfs_malloc((ino->attr_count + 8) *
-							sizeof(ntfs_attribute));
-		if (!new)
-			return -ENOMEM;
-		if (ino->attrs) {
-			ntfs_memcpy(new, ino->attrs, ino->attr_count *
-							sizeof(ntfs_attribute));
-			ntfs_free(ino->attrs);
-		}
-		ino->attrs = new;
-	}
-	if (do_insert)
-		ntfs_memmove(ino->attrs + i + 1, ino->attrs + i,
-			     (ino->attr_count - i) * sizeof(ntfs_attribute));
-	ino->attr_count++;
-	ino->attrs[i].type = type;
-	ino->attrs[i].namelen = namelen;
-	ino->attrs[i].name = name;
-	*pos = i;
-	*found = 0;
-	return 0;
-}
-
-int ntfs_make_attr_resident(ntfs_inode *ino, ntfs_attribute *attr)
-{
-	__s64 size = attr->size;
-	if (size > 0) {
-		/* FIXME: read data, free clusters */
-		return -EOPNOTSUPP;
-	}
-	attr->resident = 1;
-	return 0;
-}
-
-/* Store in the inode readable information about a run. */
-int ntfs_insert_run(ntfs_attribute *attr, int cnum, ntfs_cluster_t cluster,
-		     int len)
-{
-	/* (re-)allocate space if necessary. */
-	if ((attr->d.r.len * sizeof(ntfs_runlist)) % PAGE_SIZE == 0) {
-		ntfs_runlist* new;
-		unsigned long new_size;
-
-		ntfs_debug(DEBUG_MALLOC, "ntfs_insert_run: re-allocating "
-				"space: old attr->d.r.len = 0x%x\n",
-				attr->d.r.len);
-		new_size = attr->d.r.len * sizeof(ntfs_runlist) + PAGE_SIZE;
-		if ((new_size >> PAGE_SHIFT) > num_physpages) {
-			ntfs_error("ntfs_insert_run: attempted to allocate "
-					"more pages than num_physpages."
-					"This might be a bug or a corrupt"
-					"file system.\n");
-			return -1;
-		}
-		new = ntfs_vmalloc(new_size);
-		if (!new) {
-			ntfs_error("ntfs_insert_run: ntfs_vmalloc(new_size = "
-					"0x%x) failed\n", new_size);
-			return -1;
-		}
-		if (attr->d.r.runlist) {
-			ntfs_memcpy(new, attr->d.r.runlist, attr->d.r.len
-					* sizeof(ntfs_runlist));
-			ntfs_vfree(attr->d.r.runlist);
-		}
-		attr->d.r.runlist = new;
-	}
-	if (attr->d.r.len > cnum)
-		ntfs_memmove(attr->d.r.runlist + cnum + 1,
-			     attr->d.r.runlist + cnum,
-			     (attr->d.r.len - cnum) * sizeof(ntfs_runlist));
-	attr->d.r.runlist[cnum].lcn = cluster;
-	attr->d.r.runlist[cnum].len = len;
-	attr->d.r.len++;
-	return 0;
-}
-
-/**
- * ntfs_extend_attr - extend allocated size of an attribute
- * @ino:	ntfs inode containing the attribute to extend
- * @attr:	attribute which to extend
- * @len:	desired new length for @attr (_not_ the amount to extend by)
- *
- * Extends an attribute. Allocate clusters on the volume which @ino belongs to.
- * Extends the run list accordingly, preferably by extending the last run of
- * the existing run list, first.
- *
- * Only modifies attr->allocated, i.e. doesn't touch attr->size, nor
- * attr->initialized.
- */
-int ntfs_extend_attr(ntfs_inode *ino, ntfs_attribute *attr, const __s64 len)
-{
-	int rlen, rl2_len, err = 0;
-	ntfs_cluster_t cluster, clen;
-	ntfs_runlist *rl, *rl2;
-
-	if ((attr->flags & (ATTR_IS_COMPRESSED | ATTR_IS_ENCRYPTED)) ||
-			ino->record_count > 1)
-		return -EOPNOTSUPP;
-	/*
-	 * FIXME: Don't make non-resident if the attribute type is not right.
-	 * For example cannot make index attribute non-resident! (AIA)
-	 */
-	if (attr->resident) {
-		err = ntfs_make_attr_nonresident(ino, attr);
-		if (err)
-			return err;
-	}
-	if (len <= attr->allocated)
-		return 0;	/* Truly stupid things do sometimes happen. */
-	rl = attr->d.r.runlist;
-	rlen = attr->d.r.len;
-	if (rlen > 0)
-		cluster = rl[rlen - 1].lcn + rl[rlen - 1].len;
-	else
-		/* No preference for allocation space. */
-		cluster = (ntfs_cluster_t)-1;
-	/*
-	 * Calculate the extra space we need, and round up to multiple of
-	 * cluster size to get number of new clusters needed.
-	 */
-	clen = (len - attr->allocated + ino->vol->cluster_size - 1) >>
-			ino->vol->cluster_size_bits;
-	if (!clen)
-		return 0;
-	err = ntfs_allocate_clusters(ino->vol, &cluster, &clen, &rl2,
-			&rl2_len, DATA_ZONE);
-	if (err)
-		return err;
-	attr->allocated += (__s64)clen << ino->vol->cluster_size_bits;
-	if (rlen > 0) {
-		err = splice_runlists(&rl, &rlen, rl2, rl2_len);
-		ntfs_vfree(rl2);
-		if (err)
-			return err;
-	} else {
-		if (rl)
-			ntfs_vfree(rl);
-		rl = rl2;
-		rlen = rl2_len;
-	}
-	attr->d.r.runlist = rl;
-	attr->d.r.len = rlen;
-	return 0;
-}
-
-int ntfs_make_attr_nonresident(ntfs_inode *ino, ntfs_attribute *attr)
-{
-	int error;
-	ntfs_io io;
-	void *data = attr->d.data;
-	__s64 len = attr->size;
-
-	attr->d.r.len = 0;
-	attr->d.r.runlist = NULL;
-	attr->resident = 0;
-	/*
-	 * ->allocated is updated by ntfs_extend_attr(), while ->initialized
-	 * and ->size are updated by ntfs_readwrite_attr(). (AIA)
-	 */
-	attr->allocated = attr->initialized = 0;
-	error = ntfs_extend_attr(ino, attr, len);
-	if (error)
-		return error; /* FIXME: On error, restore old values. */
-	io.fn_put = ntfs_put;
-	io.fn_get = ntfs_get;
-	io.param = data;
-	io.size = len;
-	io.do_read = 0;
-	return ntfs_readwrite_attr(ino, attr, 0, &io);
-}
-
-int ntfs_attr_allnonresident(ntfs_inode *ino)
-{
-	int i, error = 0;
-        ntfs_volume *vol = ino->vol;
-
-	for (i = 0; !error && i < ino->attr_count; i++)
-	{
-		if (ino->attrs[i].type != vol->at_security_descriptor &&
-		    ino->attrs[i].type != vol->at_data)
-			continue;
-		error = ntfs_make_attr_nonresident(ino, ino->attrs + i);
-	}
-	return error;
-}
-
-/*
- * Resize the attribute to a newsize. attr->allocated and attr->size are
- * updated, but attr->initialized is not changed unless it becomes bigger than
- * attr->size, in which case it is set to attr->size.
- */
-int ntfs_resize_attr(ntfs_inode *ino, ntfs_attribute *attr, __s64 newsize)
-{
-	int error = 0;
-	__s64 oldsize = attr->size;
-	int clustersizebits = ino->vol->cluster_size_bits;
-	int i, count, newcount;
-	ntfs_runlist *rl, *rlt;
-
-	if (newsize == oldsize)
-		return 0;
-	if (attr->flags & (ATTR_IS_COMPRESSED | ATTR_IS_ENCRYPTED))
-		return -EOPNOTSUPP;
-	if (attr->resident) {
-		void *v;
-		if (newsize > ino->vol->mft_record_size) {
-			error = ntfs_make_attr_nonresident(ino, attr);
-			if (error)
-				return error;
-			return ntfs_resize_attr(ino, attr, newsize);
-		}
-		v = attr->d.data;
-		if (newsize) {
-			__s64 minsize = newsize;
-			attr->d.data = ntfs_malloc(newsize);
-			if (!attr->d.data) {
-				ntfs_free(v);
-				return -ENOMEM;
-			}
-			if (newsize > oldsize) {
-				minsize = oldsize;
-				ntfs_bzero((char*)attr->d.data + oldsize,
-					   newsize - oldsize);
-			}
-			ntfs_memcpy((char*)attr->d.data, v, minsize);
-		} else
-			attr->d.data = 0;
-		ntfs_free(v);
-		attr->size = newsize;
-		return 0;
-	}
-	/* Non-resident attribute. */
-	rl = attr->d.r.runlist;
-	if (newsize < oldsize) {
-		int rl_size;
-		/*
-		 * FIXME: We might be going awfully wrong for newsize = 0,
-		 * possibly even leaking memory really badly. But considering
-		 * in that case there is more breakage due to -EOPNOTSUPP stuff
-		 * further down the code path, who cares for the moment... (AIA)
-		 */
-		for (i = 0, count = 0; i < attr->d.r.len; i++) {
-			if ((__s64)(count + rl[i].len) << clustersizebits >
-					newsize) {
-				i++;
-				break;
-			}
-			count += (int)rl[i].len;
-		}
-		newcount = count;
-		/* Free unused clusters in current run, unless sparse. */
-		if (rl[--i].lcn != (ntfs_cluster_t)-1) {
-			ntfs_cluster_t rounded = newsize - ((__s64)count <<
-					clustersizebits);
-			rounded = (rounded + ino->vol->cluster_size - 1) >>
-					clustersizebits;
-			error = ntfs_deallocate_cluster_run(ino->vol, 
-					rl[i].lcn + rounded,
-					rl[i].len - rounded);
-			if (error)
-				return error; /* FIXME: Incomplete operation. */
-			rl[i].len = rounded;
-			newcount = count + rounded;
-		}
-		/* Free all other runs. */
-		i++;
-		error = ntfs_deallocate_clusters(ino->vol, rl + i,
-				attr->d.r.len - i);
-		if (error)
-			return error; /* FIXME: Incomplete operation. */
-		/*
-		 * Free space for extra runs in memory if enough memory left
-		 * to do so. FIXME: Only do it if it would free memory. (AIA)
-		 */
-		rl_size = ((i + 1) * sizeof(ntfs_runlist) + PAGE_SIZE - 1) &
-				PAGE_MASK;
-		if (rl_size < ((attr->d.r.len * sizeof(ntfs_runlist) +
-				PAGE_SIZE - 1) & PAGE_MASK)) {
-			rlt = ntfs_vmalloc(rl_size);
-			if (rlt) {
-				ntfs_memcpy(rlt, rl, i * sizeof(ntfs_runlist));
-				ntfs_vfree(rl);
-				attr->d.r.runlist = rl = rlt;
-			}
-		}
-		rl[i].lcn = (ntfs_cluster_t)-1;
-		rl[i].len = (ntfs_cluster_t)0;
-		attr->d.r.len = i;
-	} else {
-		error = ntfs_extend_attr(ino, attr, newsize);
-		if (error)
-			return error; /* FIXME: Incomplete operation. */
-		newcount = (newsize + ino->vol->cluster_size - 1) >>
-				clustersizebits;
-	}
-	/* Fill in new sizes. */
-	attr->allocated = (__s64)newcount << clustersizebits;
-	attr->size = newsize;
-	if (attr->initialized > newsize)
-		attr->initialized = newsize;
-	if (!newsize)
-		error = ntfs_make_attr_resident(ino, attr);
-	return error;
-}
-
-int ntfs_create_attr(ntfs_inode *ino, int anum, char *aname, void *data,
-		int dsize, ntfs_attribute **rattr)
-{
-	void *name;
-	int namelen;
-	int found, i;
-	int error;
-	ntfs_attribute *attr;
-	
-	if (dsize > ino->vol->mft_record_size)
-		/* FIXME: Non-resident attributes. */
-		return -EOPNOTSUPP;
-	if (aname) {
-		namelen = strlen(aname);
-		name = ntfs_malloc(2 * namelen);
-		if (!name)
-			return -ENOMEM;
-		ntfs_ascii2uni(name, aname, namelen);
-	} else {
-		name = 0;
-		namelen = 0;
-	}
-	error = ntfs_new_attr(ino, anum, name, namelen, data, dsize, &i,
-			&found);
-	if (error || found) {
-		ntfs_free(name);
-		return error ? error : -EEXIST;
-	}
-	*rattr = attr = ino->attrs + i;
-	/* Allocate a new number.
-	 * FIXME: Should this happen on inode writeback?
-	 * FIXME: Extension records not supported. */
-	error = ntfs_allocate_attr_number(ino, &i);
-	if (error)
-		return error;
-	attr->attrno = i;
-	if (attr->attrno + 1 != NTFS_GETU16(ino->attr + 0x28))
-		ntfs_error("UH OH! attr->attrno (%i) != NTFS_GETU16(ino->attr "
-				"+ 0x28) (%i)\n", attr->attrno,
-				NTFS_GETU16(ino->attr + 0x28));
-	attr->resident = 1;
-	attr->flags = 0;
-	attr->cengine = 0;
-	attr->size = attr->allocated = attr->initialized = dsize;
-
-	/* FIXME: INDEXED information should come from $AttrDef
-	 * Currently, only file names are indexed. As of NTFS v3.0 (Win2k),
-	 * this is no longer true. Different attributes can be indexed now. */
-	if (anum == ino->vol->at_file_name)
-		attr->indexed = 1;
-	else
-		attr->indexed = 0;
-	attr->d.data = ntfs_malloc(dsize);
-	if (!attr->d.data)
-		return -ENOMEM;
-	ntfs_memcpy(attr->d.data, data, dsize);
-	return 0;
-}
-
-/*
- * Non-resident attributes are stored in runs (intervals of clusters).
- *
- * This function stores in the inode readable information about a non-resident
- * attribute.
- */
-static int ntfs_process_runs(ntfs_inode *ino, ntfs_attribute* attr,
-		unsigned char *data)
-{
-	int startvcn, endvcn;
-	int vcn, cnum;
-	ntfs_cluster_t cluster;
-	int len, ctype;
-	int er = 0;
-	startvcn = NTFS_GETS64(data + 0x10);
-	endvcn = NTFS_GETS64(data + 0x18);
-
-	/* Check whether this chunk really belongs to the end. Problem with
-	 * this: this functions can get called on the last extent first, before
-	 * it is called on the other extents in sequence. This happens when the
-	 * base mft record contains the last extent instead of the first one
-	 * and the first extent is stored, like any intermediate extents in
-	 * extension mft records. This would be difficult to allow the way the
-	 * runlist is stored in memory. Thus we fix elsewhere by causing the
-	 * attribute list attribute to be processed immediately when found. The
-	 * extents will then be processed starting with the first one. */
-	for (cnum = 0, vcn = 0; cnum < attr->d.r.len; cnum++)
-		vcn += attr->d.r.runlist[cnum].len;
-	if (vcn != startvcn) {
-		ntfs_debug(DEBUG_FILE3, "ntfs_process_runs: ino = 0x%x, "
-			"attr->type = 0x%x, startvcn = 0x%x, endvcn = 0x%x, "
-			"vcn = 0x%x, cnum = 0x%x\n", ino->i_number, attr->type,
-			startvcn, endvcn, vcn, cnum);
-		if (vcn < startvcn) {
-			ntfs_error("Problem with runlist in extended record\n");
-			return -1;
-		}
-		/* Tried to insert an already inserted runlist. */
-		return 0;
-	}
-	if (!endvcn) {
-		if (!startvcn) {
-			/* Allocated length. */
-			endvcn = NTFS_GETS64(data + 0x28) - 1;
-			endvcn >>= ino->vol->cluster_size_bits;
-		} else {
-			/* This is an extent. Allocated length is not defined!
-			 * Extents must have an endvcn though so this is an
-			 * error. */
-			ntfs_error("Corrupt attribute extent. (endvcn is "
-				"missing)\n");
-			return -1;
-		}
-	}
-	data = data + NTFS_GETU16(data + 0x20);
-	cnum = attr->d.r.len;
-	cluster = 0;
-	for (vcn = startvcn; vcn <= endvcn; vcn += len)	{
-		if (ntfs_decompress_run(&data, &len, &cluster, &ctype)) {
-			ntfs_debug(DEBUG_FILE3, "ntfs_process_runs: "
-				"ntfs_decompress_run failed. i_number = 0x%x\n",
-				ino->i_number);
-			return -1;
-		}
-		if (ctype)
-			er = ntfs_insert_run(attr, cnum, -1, len);
-		else
-			er = ntfs_insert_run(attr, cnum, cluster, len);
-		if (er)
-			break;
-		cnum++;
-	}
-	if (er)
-		ntfs_error("ntfs_process_runs: ntfs_insert_run failed\n");
-	ntfs_debug(DEBUG_FILE3, "ntfs_process_runs: startvcn = 0x%x, vcn = 0x%x"
-				", endvcn = 0x%x, cnum = %i\n", startvcn, vcn,
-				endvcn, cnum);
-	return er;
-}
-  
-/* Insert the attribute starting at attr in the inode ino. */
-int ntfs_insert_attribute(ntfs_inode *ino, unsigned char *attrdata)
-{
-	int i, found;
-	int type;
-	short int *name;
-	int namelen;
-	void *data;
-	ntfs_attribute *attr;
-	int error;
-
-	type = NTFS_GETU32(attrdata);
-	namelen = NTFS_GETU8(attrdata + 9);
-	ntfs_debug(DEBUG_FILE3, "ntfs_insert_attribute: ino->i_number 0x%x, "
-			"attr type 0x%x\n", ino->i_number, type);
-	/* Read the attribute's name if it has one. */
-	if (!namelen)
-		name = 0;
-	else {
-		/* 1 Unicode character fits in 2 bytes. */
-		name = ntfs_malloc(2 * namelen);
-		if (!name)
-			return -ENOMEM;
-		ntfs_memcpy(name, attrdata + NTFS_GETU16(attrdata + 10),
-			    2 * namelen);
-	}
-	/* If resident look for value, too. */
-	if (NTFS_GETU8(attrdata + 8) == 0)
-		error = ntfs_new_attr(ino, type, name, namelen,
-				attrdata + NTFS_GETU16(attrdata + 0x14),
-				NTFS_GETU16(attrdata + 0x10), &i, &found);
-	else
-		error = ntfs_new_attr(ino, type, name, namelen, NULL, 0, &i,
-				&found);
-	if (error) {
-		ntfs_debug(DEBUG_FILE3, "ntfs_insert_attribute: ntfs_new_attr "
-				"failed.\n");
-		if (name)
-			ntfs_free(name);
-		return error;
-	}
-	if (found) {
-		/* It's already there, if not resident just process the runs. */
-		if (!ino->attrs[i].resident) {
-			ntfs_debug(DEBUG_FILE3, "ntfs_insert_attribute:"
-						" processing runs 1.\n");
-			/* FIXME: Check error code! (AIA) */
-			ntfs_process_runs(ino, ino->attrs + i, attrdata);
-		}
-		return 0;
-	}
-	attr = ino->attrs + i;
-	attr->resident = NTFS_GETU8(attrdata + 8) == 0;
-	attr->flags = *(__u16*)(attrdata + 0xC);
-	attr->attrno = NTFS_GETU16(attrdata + 0xE);
-  
-	if (attr->resident) {
-		attr->size = NTFS_GETU16(attrdata + 0x10);
-		data = attrdata + NTFS_GETU16(attrdata + 0x14);
-		attr->d.data = (void*)ntfs_malloc(attr->size);
-		if (!attr->d.data)
-			return -ENOMEM;
-		ntfs_memcpy(attr->d.data, data, attr->size);
-		attr->indexed = NTFS_GETU8(attrdata + 0x16);
-	} else {
-		attr->allocated = NTFS_GETS64(attrdata + 0x28);
-		attr->size = NTFS_GETS64(attrdata + 0x30);
-		attr->initialized = NTFS_GETS64(attrdata + 0x38);
-		attr->cengine = NTFS_GETU16(attrdata + 0x22);
-		if (attr->flags & ATTR_IS_COMPRESSED)
-			attr->compsize = NTFS_GETS64(attrdata + 0x40);
-		ntfs_debug(DEBUG_FILE3, "ntfs_insert_attribute: "
-			"attr->allocated = 0x%Lx, attr->size = 0x%Lx, "
-			"attr->initialized = 0x%Lx\n", attr->allocated,
-			attr->size, attr->initialized);
-		ino->attrs[i].d.r.runlist = 0;
-		ino->attrs[i].d.r.len = 0;
-		ntfs_debug(DEBUG_FILE3, "ntfs_insert_attribute: processing "
-				"runs 2.\n");
-		/* FIXME: Check error code! (AIA) */
-		ntfs_process_runs(ino, attr, attrdata);
-	}
-	return 0;
-}
-
-int ntfs_read_zero(ntfs_io *dest, int size)
-{
-	int i;
-	char *sparse = ntfs_calloc(512);
-	if (!sparse)
-		return -ENOMEM;
-	i = 512;
-	while (size) {
-		if (i > size)
-			i = size;
-		dest->fn_put(dest, sparse, i);
-		size -= i;
-	}
-	ntfs_free(sparse);
-	return 0;
-}
-
-/* Process compressed attributes. */
-int ntfs_read_compressed(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-			 ntfs_io *dest)
-{
-	int error = 0;
-	int clustersizebits;
-	int s_vcn, rnum, vcn, got, l1;
-	__s64 copied, len, chunk, offs1, l, chunk2;
-	ntfs_cluster_t cluster, cl1;
-	char *comp = 0, *comp1;
-	char *decomp = 0;
-	ntfs_io io;
-	ntfs_runlist *rl;
-
-	l = dest->size;
-	clustersizebits = ino->vol->cluster_size_bits;
-	/* Starting cluster of potential chunk. There are three situations:
-	   a) In a large uncompressible or sparse chunk, s_vcn is in the middle
-	      of a run.
-	   b) s_vcn is right on a run border.
-	   c) When several runs make a chunk, s_vcn is before the chunks. */
-	s_vcn = offset >> clustersizebits;
-	/* Round down to multiple of 16. */
-	s_vcn &= ~15;
-	rl = attr->d.r.runlist;
-	for (rnum = vcn = 0; rnum < attr->d.r.len && vcn + rl->len <= s_vcn;
-								rnum++, rl++)
-		vcn += rl->len;
-	if (rnum == attr->d.r.len) {
-		/* Beyond end of file. */
-		/* FIXME: Check allocated / initialized. */
-		dest->size = 0;
-		return 0;
-	}
-	io.do_read = 1;
-	io.fn_put = ntfs_put;
-	io.fn_get = 0;
-	cluster = rl->lcn;
-	len = rl->len;
-	copied = 0;
-	while (l) {
-		chunk = 0;
-		if (cluster == (ntfs_cluster_t)-1) {
-			/* Sparse cluster. */
-			__s64 ll;
-
-			if ((len - (s_vcn - vcn)) & 15)
-				ntfs_error("Unexpected sparse chunk size.");
-			ll = ((__s64)(vcn + len) << clustersizebits) - offset;
-			if (ll > l)
-				ll = l;
-			chunk = ll;
-			error = ntfs_read_zero(dest, ll);
-			if (error)
-				goto out;
-		} else if (dest->do_read) {
-			if (!comp) {
-				comp = ntfs_malloc(16 << clustersizebits);
-				if (!comp) {
-					error = -ENOMEM;
-					goto out;
-				}
-			}
-			got = 0;
-			/* We might need to start in the middle of a run. */
-			cl1 = cluster + s_vcn - vcn;
-			comp1 = comp;
-			do {
-				int delta;
-
-				io.param = comp1;
-				delta = s_vcn - vcn;
-				if (delta < 0)
-					delta = 0;
-				l1 = len - delta;
-				if (l1 > 16 - got)
-					l1 = 16 - got;
-				io.size = (__s64)l1 << clustersizebits;
-				error = ntfs_getput_clusters(ino->vol, cl1, 0,
-					       		     &io);
-				if (error)
-					goto out;
-				if (l1 + delta == len) {
-					rnum++;
-					rl++;
-					vcn += len;
-					cluster = cl1 = rl->lcn;
-					len = rl->len;
-				}
-				got += l1;
-				comp1 += (__s64)l1 << clustersizebits;
-			} while (cluster != (ntfs_cluster_t)-1 && got < 16);
-							/* Until empty run. */
-			chunk = 16 << clustersizebits;
-			if (cluster != (ntfs_cluster_t)-1 || got == 16)
-				/* Uncompressible */
-				comp1 = comp;
-			else {
-				if (!decomp) {
-					decomp = ntfs_malloc(16 << 
-							clustersizebits);
-					if (!decomp) {
-						error = -ENOMEM;
-						goto out;
-					}
-				}
-				/* Make sure there are null bytes after the
-				 * last block. */
-				*(ntfs_u32*)comp1 = 0;
-				ntfs_decompress(decomp, comp, chunk);
-				comp1 = decomp;
-			}
-			offs1 = offset - ((__s64)s_vcn << clustersizebits);
-			chunk2 = (16 << clustersizebits) - offs1;
-			if (chunk2 > l)
-				chunk2 = l;
-			if (chunk > chunk2)
-				chunk = chunk2;
-			dest->fn_put(dest, comp1 + offs1, chunk);
-		}
-		l -= chunk;
-		copied += chunk;
-		offset += chunk;
-		s_vcn = (offset >> clustersizebits) & ~15;
-		if (l && offset >= ((__s64)(vcn + len) << clustersizebits)) {
-			rnum++;
-			rl++;
-			vcn += len;
-			cluster = rl->lcn;
-			len = rl->len;
-		}
-	}
-out:
-	if (comp)
-		ntfs_free(comp);
-	if (decomp)
-		ntfs_free(decomp);
-	dest->size = copied;
-	return error;
-}
-
-int ntfs_write_compressed(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-		ntfs_io *dest)
-{
-	return -EOPNOTSUPP;
-}
-
diff -Nur linux/fs/ntfs/attr.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attr.h
--- linux/fs/ntfs/attr.h	Sat Sep  8 21:24:40 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attr.h	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
-/*
- * attr.h -  Header file for attr.c
- *
- * Copyright (C) 1997 Régis Duchesne
- * Copyright (c) 2001 Anton Altaparmakov (AIA)
- */
-#include <linux/nls.h>
-
-ntfs_u8* ntfs_find_attr_in_mft_rec(ntfs_volume *vol, ntfs_u8 *m, __u32 type,
-			wchar_t *name, __u32 name_len, int ic, __u16 instance);
-
-int ntfs_extend_attr(ntfs_inode *ino, ntfs_attribute *attr, const __s64 len);
-
-int ntfs_resize_attr(ntfs_inode *ino, ntfs_attribute *attr, __s64 newsize);
-
-int ntfs_insert_attribute(ntfs_inode *ino, unsigned char* attrdata);
-
-int ntfs_read_compressed(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-			 ntfs_io *dest);
-
-int ntfs_write_compressed(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-			  ntfs_io *dest);
-
-int ntfs_create_attr(ntfs_inode *ino, int anum, char *aname, void *data,
-		     int dsize, ntfs_attribute **rattr);
-
-int ntfs_read_zero(ntfs_io *dest, int size);
-
-int ntfs_make_attr_nonresident(ntfs_inode *ino, ntfs_attribute *attr);
-
-int ntfs_attr_allnonresident(ntfs_inode *ino);
-
-int ntfs_new_attr(ntfs_inode *ino, int type, void *name, int namelen,
-		  void *value, int value_len, int *pos, int *found);
-
-int ntfs_insert_run(ntfs_attribute *attr, int cnum, ntfs_cluster_t cluster,
-		     int len);
-
diff -Nur linux/fs/ntfs/attraops.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attraops.c
--- linux/fs/ntfs/attraops.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attraops.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,48 @@
+#include "ntfs.h"
+
+/*
+ * We need to define the attribute object structure. FIXME: Move these to
+ * ntfs.h.
+ */
+typedef struct {
+	ntfs_inode *a_ni;
+	ntfs_volume *a_vol;
+	atomic_t a_count;
+	s64 a_size;
+	struct rw_semaphore a_sem;
+	struct address_space a_mapping;
+	unsigned long a_flags;
+} attr_obj;
+
+/**
+ * ntfs_attr_readpage - fill a page @page of an attribute object @aobj with data
+ * @aobj:	attribute object to which the page @page belongs
+ * @page:	page cache page to fill with data
+ *
+ */
+//static int ntfs_attr_readpage(attr_obj *aobj, struct page *page)
+static int ntfs_attr_readpage(struct file *aobj, struct page *page)
+{
+	return -EOPNOTSUPP;
+}
+
+/*
+ * Address space operations for accessing attributes. Note that these functions
+ * do not accept an inode as the first parameter but an attribute object. We
+ * use this to implement a generic interface that is not bound to inodes in
+ * order to support multiple named streams per file, multiple bitmaps per file
+ * and directory, etc. Basically, this gives access to any attribute within an
+ * mft record.
+ *
+ * We make use of a slab cache for attribute object allocations.
+ */
+struct address_space_operations ntfs_attr_aops = {
+	writepage:	NULL,			/* Write dirty page to disk. */
+	readpage:	ntfs_attr_readpage,	/* Fill page with data. */
+	sync_page:	block_sync_page,	/* Currently, just unplugs the
+						   disk request queue. */
+	prepare_write:	NULL,			/* . */
+	commit_write:	NULL,			/* . */
+	//truncatepage:	NULL,			/* . */
+};
+
diff -Nur linux/fs/ntfs/attrib.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attrib.c
--- linux/fs/ntfs/attrib.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attrib.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,1597 @@
+/**
+ * attrib.c - NTFS attribute operations. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ntfs.h"
+
+/* Temporary helper functions -- might become macros */
+
+/**
+ * rl_mm - run_list memmove
+ *
+ * It is up to the caller to serialize access to the run list @base.
+ */
+static inline void rl_mm(run_list_element *base, int dst, int src, int size)
+{
+	if ((dst != src) && (size > 0))
+		memmove (base + dst, base + src, size * sizeof (*base));
+}
+
+/**
+ * rl_mc - run_list memory copy
+ *
+ * It is up to the caller to serialize access to the run lists @dstbase and
+ * @srcbase.
+ */
+static inline void rl_mc(run_list_element *dstbase, int dst,
+		run_list_element *srcbase, int src, int size)
+{
+	if (size > 0)
+		memcpy (dstbase+dst, srcbase+src, size * sizeof (*dstbase));
+}
+
+/**
+ * ntfs_rl_realloc - Reallocate memory for run_lists
+ * @orig:  The original memory allocation
+ * @old:   The number of run_lists in the original
+ * @new:   The number of run_lists we need space for
+ *
+ * As the run_lists grow, more memory will be required.  To prevent the
+ * kernel having to allocate and reallocate large numbers of small bits of
+ * memory, this function returns and entire page of memory.
+ *
+ * It is up to the caller to serialize access to the run list @orig.
+ *
+ * N.B.  If the new allocation doesn't require a different number of pages in
+ *       memory, the function will return the original pointer.
+ *
+ * Return: Pointer  The newly allocated, or recycled,  memory.
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ */
+static inline run_list_element *ntfs_rl_realloc(run_list_element *orig,
+		int old, int new)
+{
+	run_list_element *nrl;
+
+	old = PAGE_ALIGN (old * sizeof (*orig));
+	new = PAGE_ALIGN (new * sizeof (*orig));
+	if (old == new)
+		return orig;
+
+	nrl = ntfs_malloc_nofs (new);
+	if (!nrl)
+		return ERR_PTR (-ENOMEM);
+
+	if (orig) {
+		memcpy (nrl, orig, min (old, new));
+		ntfs_free (orig);
+	}
+	return nrl;
+}
+
+/**
+ * ntfs_rl_merge - Join together two run_lists
+ * @one:  The first run_list and destination
+ * @two:  The second run_list
+ *
+ * If possible merge together two run_lists.  For this, their VCNs and LCNs
+ * must be adjacent.
+ *
+ * It is up to the caller to serialize access to the run lists @one and @two.
+ *
+ * Return: TRUE   Success, the run_lists were merged
+ *         FALSE  Failure, the run_lists were not merged
+ */
+static inline BOOL ntfs_rl_merge(run_list_element *one, run_list_element *two)
+{
+	BUG_ON (!one || !two);
+
+	if ((one->lcn < 0) || (two->lcn < 0))     /* Are we merging holes? */
+		return FALSE;
+	if ((one->lcn + one->length) != two->lcn) /* Are the runs contiguous? */
+		return FALSE;
+	if ((one->vcn + one->length) != two->vcn) /* Are the runs misaligned? */
+		return FALSE;
+
+	one->length += two->length;
+	return TRUE;
+}
+
+/**
+ * ntfs_rl_append - Append a run_list after the given element
+ * @orig:   The original run_list to be worked on.
+ * @osize:  The number of elements in @orig (including end marker).
+ * @new:    The run_list to be inserted.
+ * @nsize:  The number of elements in @new (excluding end marker).
+ * @loc:    Append the new run_list after this element in @orig.
+ *
+ * Append a run_list after element @loc in @orig.  Merge the right end of
+ * the new run_list, if necessary.  Adjust the size of the hole before the
+ * appended run_list.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
+ * Return: Pointer, The new, combined, run_list
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ */
+static inline run_list_element *ntfs_rl_append(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
+{
+	run_list_element *res;
+	BOOL right;
+
+	BUG_ON (!orig || !new);
+
+	/* First, merge the right hand end, if necessary. */
+	right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
+
+	/* Space required: Orig size + New size, less one if we merged. */
+	res = ntfs_rl_realloc (orig, osize, osize + nsize - right);
+	if (IS_ERR (res))
+		return res;
+
+	/* Move the tail of Orig out of the way, then copy in New. */
+	rl_mm (res, loc + 1 + nsize, loc + 1 + right, osize - loc - 1 - right);
+	rl_mc (res, loc + 1, new, 0, nsize);
+
+	/* Adjust the size of the preceding hole. */
+	res[loc].length = res[loc+1].vcn - res[loc].vcn;
+
+	/* We may have changed the length of the file, so fix the end marker */
+	if (res[loc+nsize+1].lcn == LCN_ENOENT)
+		res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
+
+	return res;
+}
+
+/**
+ * ntfs_rl_insert - Insert a run_list into another
+ * @orig:   The original run_list to be worked on.
+ * @osize:  The number of elements in @orig (including end marker).
+ * @new:    The run_list to be inserted.
+ * @nsize:  The number of elements in @new (excluding end marker).
+ * @loc:    Insert the new run_list before this element in @orig.
+ *
+ * Insert a run_list before element @loc in @orig.  Merge the left end of
+ * the new run_list, if necessary.  Adjust the size of the hole after the
+ * inserted run_list.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
+ * Return: Pointer, The new, combined, run_list
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ */
+static inline run_list_element *ntfs_rl_insert(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
+{
+	run_list_element *res;
+	BOOL left = FALSE;
+	BOOL disc = FALSE;	/* Discontinuity */
+	BOOL hole = FALSE;	/* Following a hole */
+
+	BUG_ON (!orig || !new);
+
+	/* disc => Discontinuity between the end of Orig and the start of New.
+	 *         This means we might need to insert a hole.
+	 * hole => Orig ends with a hole or an unmapped region which we can
+	 *         extend to match the discontinuity. */
+	if (loc == 0) {
+		disc = (new[0].vcn > 0);
+	} else {
+		left = ntfs_rl_merge (orig + loc - 1, new);
+
+		disc = (new[0].vcn > (orig[loc-1].vcn + orig[loc-1].length));
+		if (disc)
+			hole = (orig[loc-1].lcn == LCN_HOLE);
+	}
+
+	/* Space required: Orig size + New size, less one if we merged,
+	 * plus one if there was a discontinuity, less one for a trailing hole */
+	res = ntfs_rl_realloc (orig, osize, osize + nsize - left + disc - hole);
+	if (IS_ERR (res))
+		return res;
+
+	/* Move the tail of Orig out of the way, then copy in New. */
+	rl_mm (res, loc + nsize - left + disc - hole, loc, osize - loc);
+	rl_mc (res, loc + disc - hole, new, left, nsize - left);
+
+	/* Adjust the VCN of the last run ... */
+	if (res[loc+nsize-left+disc-hole].lcn <= LCN_HOLE) {
+		res[loc+nsize-left+disc-hole].vcn =
+			res[loc+nsize-left+disc-hole-1].vcn +
+			res[loc+nsize-left+disc-hole-1].length;
+	}
+	/* ... and the length. */
+	if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
+	    (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
+		res[loc+nsize-left+disc-hole].length =
+			res[loc+nsize-left+disc-hole+1].vcn -
+			res[loc+nsize-left+disc-hole].vcn;
+	}
+
+	/* Writing beyond the end of the file and there's a discontinuity. */
+	if (disc) {
+		if (hole) {
+			res[loc-1].length = res[loc].vcn - res[loc-1].vcn;
+		} else {
+			if (loc > 0) {
+				res[loc].vcn = res[loc-1].vcn +
+					res[loc-1].length;
+				res[loc].length = res[loc+1].vcn - res[loc].vcn;
+			} else {
+				res[loc].vcn = 0;
+				res[loc].length = res[loc+1].vcn;
+			}
+			res[loc].lcn = LCN_RL_NOT_MAPPED;
+		}
+
+		if (res[loc+nsize-left+disc].lcn == LCN_ENOENT)
+			res[loc+nsize-left+disc].vcn = res[loc+nsize-left+disc-1].vcn +
+				res[loc+nsize-left+disc-1].length;
+	}
+
+	return res;
+}
+
+/**
+ * ntfs_rl_replace - Overwrite a run_list element with another run_list
+ * @orig:   The original run_list to be worked on.
+ * @osize:  The number of elements in @orig (including end marker).
+ * @new:    The run_list to be inserted.
+ * @nsize:  The number of elements in @new (excluding end marker).
+ * @loc:    Index of run_list @orig to overwrite with @new.
+ *
+ * Replace the run_list at @loc with @new.  Merge the left and right ends of
+ * the inserted run_list, if necessary.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
+ * Return: Pointer, The new, combined, run_list
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ */
+static inline run_list_element *ntfs_rl_replace(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
+{
+	run_list_element *res;
+	BOOL left = FALSE;
+	BOOL right;
+
+	BUG_ON (!orig || !new);
+
+	/* First, merge the left and right ends, if necessary. */
+	right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
+	if (loc > 0)
+		left = ntfs_rl_merge (orig + loc - 1, new);
+
+	/* Allocate some space.  We'll need less if the left, right
+	 * or both ends were merged. */
+	res = ntfs_rl_realloc (orig, osize, osize + nsize - left - right);
+	if (IS_ERR (res))
+		return res;
+
+	/* Move the tail of Orig out of the way, then copy in New. */
+	rl_mm (res, loc + nsize - left, loc + right + 1,
+		osize - loc - right - 1);
+	rl_mc (res, loc, new, left, nsize - left);
+
+	/* We may have changed the length of the file, so fix the end marker */
+	if (res[loc+nsize-left].lcn == LCN_ENOENT)
+		res[loc+nsize-left].vcn = res[loc+nsize-left-1].vcn +
+					  res[loc+nsize-left-1].length;
+	return res;
+}
+
+/**
+ * ntfs_rl_split - Insert a run_list into the centre of a hole
+ * @orig:   The original run_list to be worked on.
+ * @osize:  The number of elements in @orig (including end marker).
+ * @new:    The run_list to be inserted.
+ * @nsize:  The number of elements in @new (excluding end marker).
+ * @loc:    Index of run_list in @orig to split with @new.
+ *
+ * Split the run_list at @loc into two and insert @new.  No merging of
+ * run_lists is necessary.  Adjust the size of the holes either side.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
+ * Return: Pointer, The new, combined, run_list
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ */
+static inline run_list_element *ntfs_rl_split(run_list_element *orig, int osize,
+		run_list_element *new, int nsize, int loc)
+{
+	run_list_element *res;
+
+	BUG_ON (!orig || !new);
+
+	/* Space required: Orig size + New size + One new hole. */
+	res = ntfs_rl_realloc (orig, osize, osize + nsize + 1);
+	if (IS_ERR (res))
+		return res;
+
+	/* Move the tail of Orig out of the way, then copy in New. */
+	rl_mm (res, loc + 1 + nsize, loc, osize - loc);
+	rl_mc (res, loc + 1, new, 0, nsize);
+
+	/* Adjust the size of the holes either size of New. */
+	res[loc].length         = res[loc+1].vcn       - res[loc].vcn;
+	res[loc+nsize+1].vcn    = res[loc+nsize].vcn   + res[loc+nsize].length;
+	res[loc+nsize+1].length = res[loc+nsize+2].vcn - res[loc+nsize+1].vcn;
+
+	return res;
+}
+
+/**
+ * merge_run_lists - merge two run_lists into one
+ * @drl:  The original run_list.
+ * @srl:  The new run_list to be merge into @drl.
+ *
+ * First we sanity check the two run_lists to make sure that they are sensible
+ * and can be merged.  The @srl run_list must be either after the @drl run_list
+ * or completely within a hole in @drl.
+ *
+ * It is up to the caller to serialize access to the run lists @drl and @srl.
+ *
+ * Merging of run lists is necessary in two cases:
+ *   1. When attribute lists are used and a further extent is being mapped.
+ *   2. When new clusters are allocated to fill a hole or extend a file.
+ *
+ * There are four possible ways @srl can be merged.  It can be inserted at
+ * the beginning of a hole; split the hole in two; appended at the end of
+ * a hole; replace the whole hole.  It can also be appended to the end of
+ * the run_list, which is just a variant of the insert case.
+ *
+ * N.B.  Either, or both, of the input pointers may be freed if the function
+ *       is successful.  Only the returned pointer may be used.
+ *
+ *       If the function fails, neither of the input run_lists may be safe.
+ *
+ * Return: Pointer, The resultant merged run_list.
+ *
+ * Errors: -ENOMEM, Not enough memory to allocate run list array.
+ *         -EINVAL, Invalid parameters were passed in.
+ *         -ERANGE, The run_lists overlap and cannot be merged.
+ */
+run_list_element *merge_run_lists(run_list_element *drl, run_list_element *srl)
+{
+	run_list_element *nrl;	/* New run list. */
+	int di, si;		/* Current index into @[ds]rl. */
+	int sstart;		/* First index with lcn > LCN_RL_NOT_MAPPED. */
+	int dins;		/* Index into @drl at which to insert @srl. */
+	int dend, send;		/* Last index into @[ds]rl. */
+	int dfinal, sfinal;	/* The last index into @[ds]rl with
+				   lcn >= LCN_HOLE. */
+	int marker = 0;
+
+#if 1
+	ntfs_debug ("dst:");
+	ntfs_debug_dump_runlist (drl);
+	ntfs_debug ("src:");
+	ntfs_debug_dump_runlist (srl);
+#endif
+
+ 	/* Check for silly calling... */
+	if (unlikely (!srl))
+		return drl;
+	if (unlikely (IS_ERR (srl) || IS_ERR (drl)))
+		return ERR_PTR (-EINVAL);
+
+	/* Check for the case where the first mapping is being done now. */
+	if (unlikely (!drl)) {
+		nrl = srl;
+
+		/* Complete the source run list if necessary. */
+		if (unlikely (srl[0].vcn)) {
+			/* Scan to the end of the source run list. */
+			for (send = 0; likely (srl[send].length); send++)
+				;
+			nrl = ntfs_rl_realloc (srl, send, send + 1);
+			if (!nrl)
+				return ERR_PTR (-ENOMEM);
+
+			rl_mm (nrl, 1, 0, send);
+			nrl[0].vcn = 0;			/* Add start element. */
+			nrl[0].lcn = LCN_RL_NOT_MAPPED;
+			nrl[0].length = nrl[1].vcn;
+		}
+		goto finished;
+	}
+
+	si = di = 0;
+
+	/* Skip the unmapped start element(s) in each run_list if present. */
+	while (srl[si].length && srl[si].lcn < (LCN)LCN_HOLE)
+		si++;
+
+	/* Can't have an entirely unmapped srl run_list. */
+	BUG_ON (!srl[si].length);
+
+	/* Record the starting points. */
+	sstart = si;
+
+	/*
+	 * Skip forward in @drl until we reach the position where @srl needs to
+	 * be inserted. If we reach the end of @drl, @srl just needs to be
+	 * appended to @drl.
+	 */
+	for (; drl[di].length; di++) {
+		if ((drl[di].vcn + drl[di].length) > srl[sstart].vcn)
+			break;
+	}
+	dins = di;
+
+	/* Sanity check for illegal overlaps. */
+	if ((drl[di].vcn == srl[si].vcn) &&
+	    (drl[di].lcn >= 0) &&
+	    (srl[si].lcn >= 0)) {
+		ntfs_error (NULL, "Run lists overlap. Cannot merge! Returning "
+				"ERANGE.");
+		nrl = ERR_PTR (-ERANGE);
+		goto exit;
+	}
+
+	/* Scan to the end of both run lists in order to know their sizes. */
+	for (send = si; srl[send].length; send++)
+		;
+	for (dend = di; drl[dend].length; dend++)
+		;
+
+	if (srl[send].lcn == LCN_ENOENT) {
+		marker = send;
+	}
+
+	/* Scan to the last element with lcn >= LCN_HOLE. */
+	for (sfinal = send; sfinal >= 0 && srl[sfinal].lcn < LCN_HOLE; sfinal--)
+		;
+	for (dfinal = dend; dfinal >= 0 && drl[dfinal].lcn < LCN_HOLE; dfinal--)
+		;
+
+	{
+	BOOL start;
+	BOOL finish;
+	int ds = dend   + 1;		/* Number of elements in drl & srl */
+	int ss = sfinal - sstart + 1;
+
+	start  = ((drl[dins].lcn <  LCN_RL_NOT_MAPPED) ||    /* End of file   */
+		  (drl[dins].vcn == srl[sstart].vcn));	     /* Start of hole */
+	finish = ((drl[dins].lcn >= LCN_RL_NOT_MAPPED) &&    /* End of file   */
+		 ((drl[dins].vcn + drl[dins].length) <=      /* End of hole   */
+		  (srl[send-1].vcn + srl[send-1].length)));
+
+	/* Or we'll lose an end marker */
+	if (start && finish && (drl[dins].length == 0))
+		ss++;
+	if (marker && (drl[dins].vcn + drl[dins].length > srl[send-1].vcn))
+		finish = FALSE;
+
+#if 0
+	ntfs_debug("dfinal = %i, dend = %i", dfinal, dend);
+	ntfs_debug("sstart = %i, sfinal = %i, send = %i", sstart, sfinal, send);
+	ntfs_debug("start = %i, finish = %i", start, finish);
+	ntfs_debug("ds = %i, ss = %i, dins = %i", ds, ss, dins);
+#endif
+	if (start)
+		if (finish)
+			nrl = ntfs_rl_replace (drl, ds, srl + sstart, ss, dins);
+		else
+			nrl = ntfs_rl_insert  (drl, ds, srl + sstart, ss, dins);
+	else
+		if (finish)
+			nrl = ntfs_rl_append  (drl, ds, srl + sstart, ss, dins);
+		else
+			nrl = ntfs_rl_split   (drl, ds, srl + sstart, ss, dins);
+
+	if (marker && !IS_ERR(nrl)) {
+		for (ds = 0; nrl[ds].length; ds++)
+			;
+		nrl = ntfs_rl_insert(nrl, ds + 1, srl + marker, 1, ds);
+	}
+	}
+
+	if (likely (!IS_ERR (nrl))) {
+		/* The merge was completed successfully. */
+finished:
+		if (nrl != srl)
+			ntfs_free (srl);
+		/*ntfs_debug ("Done.");*/
+		/*ntfs_debug ("Merged run list:");*/
+
+#if 1
+		ntfs_debug ("res:");
+		ntfs_debug_dump_runlist (nrl);
+#endif
+	} else {
+		ntfs_error (NULL, "Merge failed, returning error code %ld.",
+				-PTR_ERR (nrl));
+	}
+exit:
+	return nrl;
+}
+
+/**
+ * decompress_mapping_pairs - convert mapping pairs array to run list
+ * @vol:	ntfs volume on which the attribute resides
+ * @attr:	attribute record whose mapping pairs array to decompress
+ * @run_list:	optional run list in which to insert @attr's run list
+ *
+ * Decompress the attribute @attr's mapping pairs array into a run_list and
+ * return the run list or -errno on error. If @run_list is not NULL then
+ * the mapping pairs array of @attr is decompressed and the run list inserted
+ * into the appropriate place in @run_list. If this is the case and the
+ * function returns success, the original pointer passed into @run_list is no
+ * longer valid.
+ *
+ * It is up to the caller to serialize access to the run list @old_rl.
+ *
+ * Check the return value for error with IS_ERR(ret_val). If this is FALSE,
+ * the function was successful, the return value is the new run list, and if
+ * an existing run list pointer was passed in, this is no longer valid.
+ * If IS_ERR(ret_val) returns true, there was an error, the return value is not
+ * a run_list pointer and the existing run list pointer if one was passed in
+ * has not been touched. In this case use PTR_ERR(ret_val) to obtain the error
+ * code. Following error codes are defined:
+ * 	-ENOMEM		Not enough memory to allocate run list array.
+ * 	-EIO		Corrupt run list.
+ * 	-EINVAL		Invalid parameters were passed in.
+ * 	-ERANGE		The two run lists overlap.
+ *
+ * FIXME: For now we take the conceptionally simplest approach of creating the
+ * new run list disregarding the already existing one and then splicing the
+ * two into one if that is possible (we check for overlap and discard the new
+ * run list if overlap present and return error).
+ */
+run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+		const ATTR_RECORD *attr, run_list_element *old_rl)
+{
+	VCN vcn;		/* Current vcn. */
+	LCN lcn; 		/* Current lcn. */
+	s64 deltaxcn;		/* Change in [vl]cn. */
+	run_list_element *rl = NULL;	/* The output run_list. */
+	run_list_element *rl2;	/* Temporary run_list. */
+	u8 *buf;		/* Current position in mapping pairs array. */
+	u8 *attr_end;		/* End of attribute. */
+	int rlsize;		/* Size of run_list buffer. */
+	int rlpos;		/* Current run_list position. */
+	u8 b;			/* Current byte offset in buf. */
+
+#ifdef DEBUG
+	/* Make sure attr exists and is non-resident. */
+	if (!attr || !attr->non_resident ||
+			sle64_to_cpu(attr->_ANR(lowest_vcn)) < (VCN)0) {
+		ntfs_error(vol->sb, "Invalid arguments.");
+		return ERR_PTR(-EINVAL);
+	}
+#endif
+	/* Start at vcn = lowest_vcn and lcn 0. */
+	vcn = sle64_to_cpu(attr->_ANR(lowest_vcn));
+	lcn = 0;
+	/* Get start of the mapping pairs array. */
+	buf = (u8*)attr + le16_to_cpu(attr->_ANR(mapping_pairs_offset));
+	attr_end = (u8*)attr + le32_to_cpu(attr->length);
+	if (unlikely(buf < (u8*)attr || buf > attr_end)) {
+		ntfs_error(vol->sb, "Corrupt attribute.");
+		return ERR_PTR(-EIO);
+	}
+	/* Current position in run_list array. */
+	rlpos = 0;
+	/* Allocate first page. */
+	rl = ntfs_malloc_nofs(PAGE_SIZE);
+	if (unlikely(!rl))
+		return ERR_PTR(-ENOMEM);
+	/* Current run_list buffer size in bytes. */
+	rlsize = PAGE_SIZE;
+	/* Insert unmapped starting element if necessary. */
+	if (vcn) {
+		rl->vcn = (VCN)0;
+		rl->lcn = (LCN)LCN_RL_NOT_MAPPED;
+		rl->length = vcn;
+		rlpos++;
+	}
+	while (buf < attr_end && *buf) {
+		/*
+		 * Allocate more memory if needed, including space for the
+		 * not-mapped and terminator elements. ntfs_malloc_nofs()
+		 * operates on whole pages only.
+		 */
+		if (((rlpos + 3) * sizeof(*old_rl)) > rlsize) {
+			rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);
+			if (unlikely(!rl2)) {
+				ntfs_free(rl);
+				return ERR_PTR(-ENOMEM);
+			}
+			memmove(rl2, rl, rlsize);
+			ntfs_free(rl);
+			rl = rl2;
+			rlsize += PAGE_SIZE;
+		}
+		/* Enter the current vcn into the current run_list element. */
+		(rl + rlpos)->vcn = vcn;
+		/*
+		 * Get the change in vcn, i.e. the run length in clusters.
+		 * Doing it this way ensures that we signextend negative values.
+		 * A negative run length doesn't make any sense, but hey, I
+		 * didn't make up the NTFS specs and Windows NT4 treats the run
+		 * length as a signed value so that's how it is...
+		 */
+		b = *buf & 0xf;
+		if (b) {
+			if (unlikely(buf + b > attr_end))
+				goto io_error;
+			for (deltaxcn = (s8)buf[b--]; b; b--)
+				deltaxcn = (deltaxcn << 8) + buf[b];
+		} else { /* The length entry is compulsory. */
+			ntfs_error(vol->sb, "Missing length entry in mapping "
+					"pairs array.");
+			deltaxcn = (s64)-1;
+		}
+		/*
+		 * Assume a negative length to indicate data corruption and
+		 * hence clean-up and return NULL.
+		 */
+		if (unlikely(deltaxcn < 0)) {
+			ntfs_error(vol->sb, "Invalid length in mapping pairs "
+					"array.");
+			goto err_out;
+		}
+		/*
+		 * Enter the current run length into the current run_list
+		 * element.
+		 */
+		(rl + rlpos)->length = deltaxcn;
+		/* Increment the current vcn by the current run length. */
+		vcn += deltaxcn;
+		/*
+		 * There might be no lcn change at all, as is the case for
+		 * sparse clusters on NTFS 3.0+, in which case we set the lcn
+		 * to LCN_HOLE.
+		 */
+		if (!(*buf & 0xf0))
+			(rl + rlpos)->lcn = (LCN)LCN_HOLE;
+		else {
+			/* Get the lcn change which really can be negative. */
+			u8 b2 = *buf & 0xf;
+			b = b2 + ((*buf >> 4) & 0xf);
+			if (buf + b > attr_end)
+				goto io_error;
+			for (deltaxcn = (s8)buf[b--]; b > b2; b--)
+				deltaxcn = (deltaxcn << 8) + buf[b];
+			/* Change the current lcn to it's new value. */
+			lcn += deltaxcn;
+#ifdef DEBUG
+			/*
+			 * On NTFS 1.2-, apparently can have lcn == -1 to
+			 * indicate a hole. But we haven't verified ourselves
+			 * whether it is really the lcn or the deltaxcn that is
+			 * -1. So if either is found give us a message so we
+			 * can investigate it further!
+			 */
+			if (vol->major_ver < 3) {
+				if (unlikely(deltaxcn == (LCN)-1))
+					ntfs_error(vol->sb, "lcn delta == -1");
+				if (unlikely(lcn == (LCN)-1))
+					ntfs_error(vol->sb, "lcn == -1");
+			}
+#endif
+			/* Check lcn is not below -1. */
+			if (unlikely(lcn < (LCN)-1)) {
+				ntfs_error(vol->sb, "Invalid LCN < -1 in "
+						"mapping pairs array.");
+				goto err_out;
+			}
+			/* Enter the current lcn into the run_list element. */
+			(rl + rlpos)->lcn = lcn;
+		}
+		/* Get to the next run_list element. */
+		rlpos++;
+		/* Increment the buffer position to the next mapping pair. */
+		buf += (*buf & 0xf) + ((*buf >> 4) & 0xf) + 1;
+	}
+	if (unlikely(buf >= attr_end))
+		goto io_error;
+	/*
+	 * If there is a highest_vcn specified, it must be equal to the final
+	 * vcn in the run list - 1, or something has gone badly wrong.
+	 */
+	deltaxcn = sle64_to_cpu(attr->_ANR(highest_vcn));
+	if (unlikely(deltaxcn && vcn - 1 != deltaxcn)) {
+mpa_err:
+		ntfs_error(vol->sb, "Corrupt mapping pairs array in "
+				"non-resident attribute.");
+		goto err_out;
+	}
+	/* Setup not mapped run_list element if this is the base extent. */
+	if (!attr->_ANR(lowest_vcn)) {
+		VCN max_cluster;
+
+		max_cluster = (sle64_to_cpu(attr->_ANR(allocated_size)) +
+				vol->cluster_size - 1) >>
+				vol->cluster_size_bits;
+		/*
+		 * If there is a difference between the highest_vcn and the
+		 * highest cluster, the run list is either corrupt or, more
+		 * likely, there are more extents following this one.
+		 */
+		if (deltaxcn < --max_cluster) {
+			//RAR ntfs_debug("More extents to follow; deltaxcn = 0x%Lx, "
+					//RAR "max_cluster = 0x%Lx",
+					//RAR (long long)deltaxcn,
+					//RAR (long long)max_cluster);
+			(rl + rlpos)->vcn = vcn;
+			vcn += (rl + rlpos)->length = max_cluster - deltaxcn;
+			(rl + rlpos)->lcn = (LCN)LCN_RL_NOT_MAPPED;
+			rlpos++;
+		} else if (unlikely(deltaxcn > max_cluster)) {
+			ntfs_error(vol->sb, "Corrupt attribute. deltaxcn = "
+					"0x%Lx, max_cluster = 0x%Lx",
+					(long long)deltaxcn,
+					(long long)max_cluster);
+			goto mpa_err;
+		}
+		(rl + rlpos)->lcn = (LCN)LCN_ENOENT;
+	} else /* Not the base extent. There may be more extents to follow. */
+		(rl + rlpos)->lcn = (LCN)LCN_RL_NOT_MAPPED;
+
+	/* Setup terminating run_list element. */
+	(rl + rlpos)->vcn = vcn;
+	(rl + rlpos)->length = (s64)0;
+	//RAR ntfs_debug("Mapping pairs array successfully decompressed.");
+	//RAR ntfs_debug_dump_runlist(rl);
+	/* If no existing run list was specified, we are done. */
+	if (!old_rl)
+		return rl;
+	/* Now combine the new and old run lists checking for overlaps. */
+	rl2 = merge_run_lists(old_rl, rl);
+	if (likely(!IS_ERR(rl2)))
+		return rl2;
+	ntfs_free(rl);
+	ntfs_error(vol->sb, "Failed to merge run lists.");
+	return rl2;
+io_error:
+	ntfs_error(vol->sb, "Corrupt attribute.");
+err_out:
+	ntfs_free(rl);
+	return ERR_PTR(-EIO);
+}
+
+/**
+ * map_run_list - map (a part of) a run list of an ntfs inode
+ * @ni:		ntfs inode for which to map (part of) a run list 
+ * @vcn:	map run list part containing this vcn
+ *
+ * Map the part of a run list containing the @vcn of an the ntfs inode @ni.
+ *
+ * Return 0 on success and -errno on error.
+ */
+int map_run_list(ntfs_inode *ni, VCN vcn)
+{
+	attr_search_context *ctx;
+	MFT_RECORD *mrec;
+	const uchar_t *name;
+	u32 name_len;
+	ATTR_TYPES at;
+	int err = 0;
+	
+	ntfs_debug("Mapping run list part containing vcn 0x%Lx.",
+			(long long)vcn);
+
+	/* Map, pin and lock the mft record for reading. */
+	mrec = map_mft_record(READ, ni);
+	if (IS_ERR(mrec))
+		return PTR_ERR(mrec);
+
+	ctx = get_attr_search_ctx(ni, mrec);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto unm_err_out;
+	}
+
+	/* The attribute type is determined from the inode type. */
+	if (S_ISDIR(VFS_I(ni)->i_mode)) {
+		at = AT_INDEX_ALLOCATION;
+		name = I30;
+		name_len = 4;
+	} else {
+		at = AT_DATA;
+		name = NULL;
+		name_len = 0;
+	}
+
+	/* Find the attribute in the mft record. */
+	if (!lookup_attr(at, name, name_len, CASE_SENSITIVE, vcn, NULL, 0,
+			ctx)) {
+		put_attr_search_ctx(ctx);
+		err = -ENOENT;
+		goto unm_err_out;
+	}
+
+	/* Lock the run list. */
+	down_write(&ni->run_list.lock);
+
+	/* Make sure someone else didn't do the work while we were spinning. */
+	if (likely(vcn_to_lcn(ni->run_list.rl, vcn) <= LCN_RL_NOT_MAPPED)) {
+		run_list_element *rl;
+
+		/* Decode the run list. */
+		rl = decompress_mapping_pairs(ni->vol, ctx->attr,
+				ni->run_list.rl);
+
+		/* Flag any errors or set the run list if successful. */
+		if (unlikely(IS_ERR(rl)))
+			err = PTR_ERR(rl);
+		else
+			ni->run_list.rl = rl;
+	}
+
+	/* Unlock the run list. */
+	up_write(&ni->run_list.lock);
+	
+	put_attr_search_ctx(ctx);
+
+	/* Unlock, unpin and release the mft record. */
+	unmap_mft_record(READ, ni);
+
+	/* If an error occured, return it. */
+	ntfs_debug("Done.");
+	return err;
+
+unm_err_out:
+	unmap_mft_record(READ, ni);
+	return err;
+}
+
+/**
+ * vcn_to_lcn - convert a vcn into a lcn given a run list
+ * @rl:		run list to use for conversion
+ * @vcn:	vcn to convert
+ *
+ * Convert the virtual cluster number @vcn of an attribute into a logical
+ * cluster number (lcn) of a device using the run list @rl to map vcns to their
+ * corresponding lcns.
+ *
+ * It is up to the caller to serialize access to the run list @rl.
+ *
+ * Since lcns must be >= 0, we use negative return values with special meaning:
+ *
+ * Return value			Meaning / Description
+ * ==================================================
+ *  -1 = LCN_HOLE		Hole / not allocated on disk.
+ *  -2 = LCN_RL_NOT_MAPPED	This is part of the run list which has not been
+ *				inserted into the run list yet.
+ *  -3 = LCN_ENOENT		There is no such vcn in the attribute.
+ *  -4 = LCN_EINVAL		Input parameter error (if debug enabled).
+ */
+LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn)
+{
+	int i;
+
+#ifdef DEBUG
+	if (vcn < (VCN)0)
+		return (LCN)LCN_EINVAL;
+#endif
+	/*
+	 * If rl is NULL, assume that we have found an unmapped run list. The
+	 * caller can then attempt to map it and fail appropriately if
+	 * necessary.
+	 */
+	if (unlikely(!rl))
+		return (LCN)LCN_RL_NOT_MAPPED;
+
+	/* Catch out of lower bounds vcn. */
+	if (unlikely(vcn < rl[0].vcn))
+		return (LCN)LCN_ENOENT;
+
+	for (i = 0; likely(rl[i].length); i++) {
+		if (unlikely(vcn < rl[i+1].vcn)) {
+			if (likely(rl[i].lcn >= (LCN)0))
+				return rl[i].lcn + (vcn - rl[i].vcn);
+			return rl[i].lcn;
+		}
+	}
+	/*
+	 * The terminator element is setup to the correct value, i.e. one of
+	 * LCN_HOLE, LCN_RL_NOT_MAPPED, or LCN_ENOENT.
+	 */
+	if (likely(rl[i].lcn < (LCN)0))
+		return rl[i].lcn;
+	/* Just in case... We could replace this with BUG() some day. */
+	return (LCN)LCN_ENOENT;
+}
+
+/**
+ * find_attr - find (next) attribute in mft record
+ * @type:	attribute type to find
+ * @name:	attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len:	attribute name length (only needed if @name present)
+ * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @val:	attribute value to find (optional, resident attributes only)
+ * @val_len:	attribute value length
+ * @ctx:	search context with mft record and attribute to search from
+ *
+ * You shouldn't need to call this function directly. Use lookup_attr() instead.
+ *
+ * find_attr() takes a search context @ctx as parameter and searches the mft
+ * record specified by @ctx->mrec, beginning at @ctx->attr, for an attribute of
+ * @type, optionally @name and @val. If found, find_attr() returns TRUE and
+ * @ctx->attr will point to the found attribute. If not found, find_attr()
+ * returns FALSE and @ctx->attr is undefined (i.e. do not rely on it not
+ * changing).
+ *
+ * If @ctx->is_first is TRUE, the search begins with @ctx->attr itself. If it
+ * is FALSE, the search begins after @ctx->attr.
+ *
+ * If @ic is IGNORE_CASE, the @name comparisson is not case sensitive and
+ * @ctx->ntfs_ino must be set to the ntfs inode to which the mft record
+ * @ctx->mrec belongs. This is so we can get at the ntfs volume and hence at
+ * the upcase table. If @ic is CASE_SENSITIVE, the comparison is case
+ * sensitive. When @name is present, @name_len is the @name length in Unicode
+ * characters.
+ *
+ * If @name is not present (NULL), we assume that the unnamed attribute is
+ * being searched for.
+ *
+ * Finally, the resident attribute value @val is looked for, if present. If @val
+ * is not present (NULL), @val_len is ignored.
+ *
+ * find_attr() only searches the specified mft record and it ignores the
+ * presence of an attribute list attribute (unless it is the one being searched
+ * for, obviously). If you need to take attribute lists into consideration, use
+ * lookup_attr() instead (see below). This also means that you cannot use
+ * find_attr() to search for extent records of non-resident attributes, as
+ * extents with lowest_vcn != 0 are usually described by the attribute list
+ * attribute only. - Note that it is possible that the first extent is only in
+ * the attribute list while the last extent is in the base mft record, so don't
+ * rely on being able to find the first extent in the base mft record.
+ *
+ * Warning: Never use @val when looking for attribute types which can be
+ *	    non-resident as this most likely will result in a crash!
+ */
+BOOL find_attr(const ATTR_TYPES type, const uchar_t *name, const u32 name_len,
+		const IGNORE_CASE_BOOL ic, const u8 *val, const u32 val_len,
+		attr_search_context *ctx)
+{
+	ATTR_RECORD *a;
+	ntfs_volume *vol;
+	uchar_t *upcase;
+	u32 upcase_len;
+
+	if (ic == IGNORE_CASE) {
+		vol = ctx->ntfs_ino->vol;
+		upcase = vol->upcase;
+		upcase_len = vol->upcase_len;
+	} else {
+		vol = NULL;
+		upcase = NULL;
+		upcase_len = 0;
+	}
+	/*
+	 * Iterate over attributes in mft record starting at @ctx->attr, or the
+	 * attribute following that, if @ctx->is_first is TRUE.
+	 */
+	if (ctx->is_first) {
+		a = ctx->attr;
+		ctx->is_first = FALSE;
+	} else
+		a = (ATTR_RECORD*)((u8*)ctx->attr +
+				le32_to_cpu(ctx->attr->length));
+	for (;;	a = (ATTR_RECORD*)((u8*)a + le32_to_cpu(a->length))) {
+		if ((u8*)a < (u8*)ctx->mrec || (u8*)a > (u8*)ctx->mrec +
+				le32_to_cpu(ctx->mrec->bytes_allocated))
+			break;
+		ctx->attr = a;
+		ntfs_debug("attr type = 0x%x", le32_to_cpu(a->type));
+		/* We catch $END with this more general check, too... */
+		if (le32_to_cpu(a->type) > le32_to_cpu(type))
+			return FALSE;
+		if (unlikely(!a->length))
+			break;
+		if (a->type != type)
+			continue;
+		/* 
+		 * If @name is present, compare the two names. If @name is
+		 * missing, assume we want an unnamed attribute.
+		 */
+		if (!name) {
+			/* The search failed if the found attribute is named. */
+			if (a->name_length)
+				return FALSE;
+		} else if (!ntfs_are_names_equal(name, name_len,
+			    (uchar_t*)((u8*)a + le16_to_cpu(a->name_offset)),
+			    a->name_length, ic, upcase, upcase_len)) {
+			register int rc;
+			
+			rc = ntfs_collate_names(name, name_len,
+					(uchar_t*)((u8*)a +
+						le16_to_cpu(a->name_offset)),
+					a->name_length, 1, IGNORE_CASE,
+					upcase, upcase_len);
+			/*
+			 * If @name collates before a->name, there is no
+			 * matching attribute.
+			 */
+			if (rc == -1)
+				return FALSE;
+			/* If the strings are not equal, continue search. */
+			if (rc)
+	 			continue;
+			rc = ntfs_collate_names(name, name_len,
+					(uchar_t*)((u8*)a +
+						le16_to_cpu(a->name_offset)),
+					a->name_length, 1, CASE_SENSITIVE,
+					upcase, upcase_len);
+			if (rc == -1)
+				return FALSE;
+			if (rc)
+				continue;
+		}
+		/*
+		 * The names match or @name not present and attribute is
+		 * unnamed. If no @val specified, we have found the attribute
+		 * and are done.
+		 */
+		if (!val)
+			return TRUE;
+		/* @val is present; compare values. */
+		else {
+			register int rc;
+			
+			rc = memcmp(val, (u8*)a +le16_to_cpu(a->_ARA(value_offset)),
+				min(val_len, le32_to_cpu(a->_ARA(value_length))));
+			/*
+			 * If @val collates before the current attribute's
+			 * value, there is no matching attribute.
+			 */
+			if (!rc) {
+				register u32 avl;
+				avl = le32_to_cpu(a->_ARA(value_length));
+				if (val_len == avl)
+					return TRUE;
+				if (val_len < avl)
+					return FALSE;
+			} else if (rc < 0)
+				return FALSE;
+		}
+	}
+	ntfs_error(NULL, "Inode is corrupt. Run chkdsk.");
+	return FALSE;
+}
+
+/**
+ * load_attribute_list - load an attribute list into memory
+ * @vol:		ntfs volume from which to read
+ * @run_list:		run list of the attribute list
+ * @al:			destination buffer
+ * @size:		size of the destination buffer in bytes
+ * @initialized_size:	initialized size of the attribute list
+ *
+ * Walk the run list @run_list and load all clusters from it copying them into
+ * the linear buffer @al. The maximum number of bytes copied to @al is @size
+ * bytes. Note, @size does not need to be a multiple of the cluster size. If
+ * @initialized_size is less than @size, the region in @al between
+ * @initialized_size and @size will be zeroed and not read from disk.
+ *
+ * Return 0 on success or -errno on error.
+ */
+int load_attribute_list(ntfs_volume *vol, run_list *run_list, u8 *al,
+		const s64 size, const s64 initialized_size)
+{
+	LCN lcn;
+	u8 *al_end = al + initialized_size;
+	run_list_element *rl;
+	struct buffer_head *bh;
+	struct super_block *sb = vol->sb;
+	unsigned long block_size = sb->s_blocksize;
+	unsigned long block, max_block;
+	int err = 0;
+	unsigned char block_size_bits = sb->s_blocksize_bits;
+
+	ntfs_debug("Entering.");
+#ifdef DEBUG
+	if (!vol || !run_list || !al || size <= 0 || initialized_size < 0 ||
+			initialized_size > size)
+		return -EINVAL;
+#endif
+	if (!initialized_size) {
+		memset(al, 0, size);
+		return 0;
+	}
+	down_read(&run_list->lock);
+	rl = run_list->rl;
+	/* Read all clusters specified by the run list one run at a time. */
+	while (rl->length) {
+		lcn = vcn_to_lcn(rl, rl->vcn);
+		ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
+				(long long)rl->vcn, (long long)lcn);
+		/* The attribute list cannot be sparse. */
+		if (lcn < 0) {
+			ntfs_error(sb, "vcn_to_lcn() failed. Cannot read "
+					"attribute list.");
+			goto err_out;
+		}
+		block = lcn << vol->cluster_size_bits >> block_size_bits;
+		/* Read the run from device in chunks of block_size bytes. */
+		max_block = block + (rl->length << vol->cluster_size_bits >>
+				block_size_bits);
+		ntfs_debug("max_block = 0x%lx.", max_block);
+		do {
+			ntfs_debug("Reading block = 0x%lx.", block);
+			bh = sb_bread(sb, block);
+			if (!bh) {
+				ntfs_error(sb, "sb_bread() failed. Cannot "
+						"read attribute list.");
+				goto err_out;
+			}
+			if (al + block_size > al_end)
+				goto do_partial;
+			memcpy(al, bh->b_data, block_size);
+			brelse(bh);
+			al += block_size;
+		} while (++block < max_block);
+		rl++;
+	}
+	if (initialized_size < size) {
+initialize:
+		memset(al + initialized_size, 0, size - initialized_size);
+	}
+done:
+	up_read(&run_list->lock);
+	return err;
+do_partial:
+	if (al < al_end) {
+		/* Partial block. */
+		memcpy(al, bh->b_data, al_end - al);
+		brelse(bh);
+		/*
+		 * Skip sanity checking if initialized_size < size as it is
+		 * too much trouble.
+		 */
+		if (initialized_size < size)
+			goto initialize;
+		/* If the final lcn is partial all is fine. */
+		if (((s64)(block - (lcn << vol->cluster_size_bits >>
+				block_size_bits)) << block_size_bits >>
+				vol->cluster_size_bits) == rl->length - 1) {
+			if (!rl[1].length || (rl[1].lcn == LCN_RL_NOT_MAPPED
+					&& !rl[2].length))
+				goto done;
+		}
+	} else
+		brelse(bh);
+	/* Real overflow! */
+	ntfs_error(sb, "Attribute list buffer overflow. Read attribute list "
+			"is truncated.");
+err_out:
+	err = -EIO;
+	goto done;
+}
+
+/**
+ * find_external_attr - find an attribute in the attribute list of an ntfs inode
+ * @type:	attribute type to find
+ * @name:	attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len:	attribute name length (only needed if @name present)
+ * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @lowest_vcn:	lowest vcn to find (optional, non-resident attributes only)
+ * @val:	attribute value to find (optional, resident attributes only)
+ * @val_len:	attribute value length
+ * @ctx:	search context with mft record and attribute to search from
+ *
+ * You shouldn't need to call this function directly. Use lookup_attr() instead.
+ *
+ * Find an attribute by searching the attribute list for the corresponding
+ * attribute list entry. Having found the entry, map the mft record for read
+ * if the attribute is in a different mft record/inode, find_attr the attribute
+ * in there and return it.
+ *
+ * On first search @ctx->ntfs_ino must be the base mft record and @ctx must
+ * have been obtained from a call to get_attr_search_ctx(). On subsequent calls
+ * @ctx->ntfs_ino can be any extent inode, too (@ctx->base_ntfs_ino is then the
+ * base inode).
+ *
+ * After finishing with the attribute/mft record you need to call
+ * release_attr_search_ctx() to cleanup the search context (unmapping any
+ * mapped inodes, etc).
+ *
+ * Return TRUE if the search was successful and FALSE if not. When TRUE,
+ * @ctx->attr is the found attribute and it is in mft record @ctx->mrec. When
+ * FALSE, @ctx->attr is the attribute which collates just after the attribute
+ * being searched for in the base ntfs inode, i.e. if one wants to add the
+ * attribute to the mft record this is the correct place to insert it into
+ * and if there is not enough space, the attribute should be placed in an
+ * extent mft record.
+ */
+static BOOL find_external_attr(const ATTR_TYPES type, const uchar_t *name,
+		const u32 name_len, const IGNORE_CASE_BOOL ic,
+		const VCN lowest_vcn, const u8 *val, const u32 val_len,
+		attr_search_context *ctx)
+{
+	ntfs_inode *base_ni, *ni;
+	ntfs_volume *vol;
+	ATTR_LIST_ENTRY *al_entry, *next_al_entry;
+	u8 *al_start, *al_end;
+	ATTR_RECORD *a;
+	uchar_t *al_name;
+	u32 al_name_len;
+
+	ni = ctx->ntfs_ino;
+	base_ni = ctx->base_ntfs_ino;
+	ntfs_debug("Entering for inode 0x%Lx, type 0x%x.",
+			(unsigned long long)ni->mft_no, type);
+	if (!base_ni) {
+		/* First call happens with the base mft record. */
+		base_ni = ctx->base_ntfs_ino = ctx->ntfs_ino;
+		ctx->base_mrec = ctx->mrec;
+	}
+	if (ni == base_ni)
+		ctx->base_attr = ctx->attr;
+	vol = base_ni->vol;
+	al_start = base_ni->attr_list;
+	al_end = al_start + base_ni->attr_list_size;
+	if (!ctx->al_entry)
+		ctx->al_entry = (ATTR_LIST_ENTRY*)al_start;
+	/*
+	 * Iterate over entries in attribute list starting at @ctx->al_entry,
+	 * or the entry following that, if @ctx->is_first is TRUE.
+	 */
+	if (ctx->is_first) {
+		al_entry = ctx->al_entry;
+		ctx->is_first = FALSE;
+	} else
+		al_entry = (ATTR_LIST_ENTRY*)((u8*)ctx->al_entry +
+				le16_to_cpu(ctx->al_entry->length));
+	for (;; al_entry = next_al_entry) {
+		/* Out of bounds check. */
+		if ((u8*)al_entry < base_ni->attr_list ||
+				(u8*)al_entry > al_end)
+			break;	/* Inode is corrupt. */
+		ctx->al_entry = al_entry;
+		/* Catch the end of the attribute list. */
+		if ((u8*)al_entry == al_end)
+			goto not_found;
+		if (!al_entry->length)
+			break;
+		if ((u8*)al_entry + 6 > al_end || (u8*)al_entry +
+				le16_to_cpu(al_entry->length) > al_end)
+			break;
+		next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +
+				le16_to_cpu(al_entry->length));
+		if (le32_to_cpu(al_entry->type) > le32_to_cpu(type))
+			goto not_found;
+		if (type != al_entry->type)
+			continue;
+		/*
+		 * If @name is present, compare the two names. If @name is
+		 * missing, assume we want an unnamed attribute.
+		 */
+		al_name_len = al_entry->name_length;
+		al_name = (uchar_t*)((u8*)al_entry + al_entry->name_offset);
+		if (!name) {
+			if (al_name_len)
+				goto not_found;
+		} else if (!ntfs_are_names_equal(al_name, al_name_len, name,
+				name_len, ic, vol->upcase, vol->upcase_len)) {
+			register int rc;
+
+			rc = ntfs_collate_names(name, name_len, al_name,
+					al_name_len, 1, IGNORE_CASE,
+					vol->upcase, vol->upcase_len);
+			/*
+			 * If @name collates before al_name, there is no
+			 * matching attribute.
+			 */
+			if (rc == -1)
+				goto not_found;
+			/* If the strings are not equal, continue search. */
+			if (rc)
+				continue;
+			/*
+			 * FIXME: Reverse engineering showed 0, IGNORE_CASE but
+			 * that is inconsistent with find_attr(). The subsequent
+			 * rc checks were also different. Perhaps I made a
+			 * mistake in one of the two. Need to recheck which is
+			 * correct or at least see what is going on... (AIA)
+			 */
+			rc = ntfs_collate_names(name, name_len, al_name,
+					al_name_len, 1, CASE_SENSITIVE,
+					vol->upcase, vol->upcase_len);
+			if (rc == -1)
+				goto not_found;
+			if (rc)
+				continue;
+		}
+		/*
+		 * The names match or @name not present and attribute is
+		 * unnamed. Now check @lowest_vcn. Continue search if the
+		 * next attribute list entry still fits @lowest_vcn. Otherwise
+		 * we have reached the right one or the search has failed.
+		 */
+		if (lowest_vcn && (u8*)next_al_entry >= al_start	    &&
+				(u8*)next_al_entry + 6 < al_end		    &&
+				(u8*)next_al_entry + le16_to_cpu(
+					next_al_entry->length) <= al_end    &&	
+				sle64_to_cpu(next_al_entry->lowest_vcn) <=
+					sle64_to_cpu(lowest_vcn)	    &&
+				next_al_entry->type == al_entry->type	    &&
+				next_al_entry->name_length == al_name_len   &&
+				ntfs_are_names_equal((uchar_t*)((u8*)
+					next_al_entry +
+					next_al_entry->name_offset),
+					next_al_entry->name_length,
+					al_name, al_name_len, CASE_SENSITIVE,
+					vol->upcase, vol->upcase_len))
+			continue;
+		if (MREF_LE(al_entry->mft_reference) == ni->mft_no) {
+			if (MSEQNO_LE(al_entry->mft_reference) != ni->seq_no) {
+				ntfs_error(vol->sb, "Found stale mft "
+						"reference in attribute list!");
+				break;
+			}
+		} else { /* Mft references do not match. */
+			/* If there is a mapped record unmap it first. */
+			if (ni != base_ni)
+				unmap_extent_mft_record(ni);
+			/* Do we want the base record back? */
+			if (MREF_LE(al_entry->mft_reference) ==
+					base_ni->mft_no) {
+				ni = ctx->ntfs_ino = base_ni;
+				ctx->mrec = ctx->base_mrec;
+			} else {
+				/* We want an extent record. */
+				ctx->mrec = map_extent_mft_record(base_ni,
+						al_entry->mft_reference, &ni);
+				ctx->ntfs_ino = ni;
+				if (IS_ERR(ctx->mrec)) {
+					ntfs_error(vol->sb, "Failed to map mft "
+							"record, error code "
+							"%ld.",
+							-PTR_ERR(ctx->mrec));
+					break;
+				}
+			}
+			ctx->attr = (ATTR_RECORD*)((u8*)ctx->mrec +
+					le16_to_cpu(ctx->mrec->attrs_offset));
+		}
+		/*
+		 * ctx->vfs_ino, ctx->mrec, and ctx->attr now point to the
+		 * mft record containing the attribute represented by the
+		 * current al_entry.
+		 */
+		/*
+		 * We could call into find_attr() to find the right attribute
+		 * in this mft record but this would be less efficient and not
+		 * quite accurate as find_attr() ignores the attribute instance
+		 * numbers for example which become important when one plays
+		 * with attribute lists. Also, because a proper match has been
+		 * found in the attribute list entry above, the comparison can
+		 * now be optimized. So it is worth re-implementing a
+		 * simplified find_attr() here.
+		 */
+		a = ctx->attr;
+		/*
+		 * Use a manual loop so we can still use break and continue
+		 * with the same meanings as above.
+		 */
+do_next_attr_loop:
+		if ((u8*)a < (u8*)ctx->mrec || (u8*)a > (u8*)ctx->mrec +
+				le32_to_cpu(ctx->mrec->bytes_allocated))
+			break;
+		if (a->type == AT_END)
+			continue;
+		if (!a->length)
+			break;
+		if (al_entry->instance != a->instance)
+			goto do_next_attr;
+		if (al_entry->type != a->type)
+			continue;
+		if (name) {
+			if (a->name_length != al_name_len)
+				continue;
+			if (!ntfs_are_names_equal((uchar_t*)((u8*)a +
+					le16_to_cpu(a->name_offset)),
+					a->name_length, al_name, al_name_len,
+					CASE_SENSITIVE, vol->upcase,
+					vol->upcase_len))
+				continue;
+		}
+		ctx->attr = a;
+		/*
+		 * If no @val specified or @val specified and it matches, we
+		 * have found it!
+		 */
+		if (!val || (!a->non_resident && le32_to_cpu(a->_ARA(value_length))
+				== val_len && !memcmp((u8*)a +
+				le16_to_cpu(a->_ARA(value_offset)), val, val_len))) {
+			ntfs_debug("Done, found.");
+			return TRUE;
+		}
+do_next_attr:
+		/* Proceed to the next attribute in the current mft record. */
+		a = (ATTR_RECORD*)((u8*)a + le32_to_cpu(a->length));
+		goto do_next_attr_loop;
+	}
+	ntfs_error(base_ni->vol->sb, "Inode contains corrupt attribute list "
+			"attribute.\n");
+	if (ni != base_ni) {
+		unmap_extent_mft_record(ni);
+		ctx->ntfs_ino = base_ni;
+		ctx->mrec = ctx->base_mrec;
+		ctx->attr = ctx->base_attr;
+	}
+	/*
+	 * FIXME: We absolutely have to return ERROR status instead of just
+	 * false or we will blow up or even worse cause corruption when we add
+	 * write support and we reach this code path!
+	 */
+	printk(KERN_CRIT "NTFS: FIXME: Hit unfinished error code path!!!\n");
+	return FALSE;
+not_found:
+	/*
+	 * Seek to the end of the base mft record, i.e. when we return false,
+	 * ctx->mrec and ctx->attr indicate where the attribute should be
+	 * inserted into the attribute record.
+	 * And of course ctx->al_entry points to the end of the attribute
+	 * list inside NTFS_I(ctx->base_vfs_ino)->attr_list.
+	 *
+	 * FIXME: Do we really want to do this here? Think about it... (AIA)
+	 */
+	reinit_attr_search_ctx(ctx);
+	find_attr(type, name, name_len, ic, val, val_len, ctx);
+	ntfs_debug("Done, not found.");
+	return FALSE;
+}
+
+/**
+ * lookup_attr - find an attribute in an ntfs inode
+ * @type:	attribute type to find
+ * @name:	attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len:	attribute name length (only needed if @name present)
+ * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @lowest_vcn:	lowest vcn to find (optional, non-resident attributes only)
+ * @val:	attribute value to find (optional, resident attributes only)
+ * @val_len:	attribute value length
+ * @ctx:	search context with mft record and attribute to search from
+ *
+ * Find an attribute in an ntfs inode. On first search @ctx->ntfs_ino must
+ * be the base mft record and @ctx must have been obtained from a call to
+ * get_attr_search_ctx().
+ *
+ * This function transparently handles attribute lists and @ctx is used to
+ * continue searches where they were left off at.
+ *
+ * After finishing with the attribute/mft record you need to call
+ * release_attr_search_ctx() to cleanup the search context (unmapping any
+ * mapped inodes, etc).
+ *
+ * Return TRUE if the search was successful and FALSE if not. When TRUE,
+ * @ctx->attr is the found attribute and it is in mft record @ctx->mrec. When
+ * FALSE, @ctx->attr is the attribute which collates just after the attribute
+ * being searched for, i.e. if one wants to add the attribute to the mft
+ * record this is the correct place to insert it into.
+ */
+BOOL lookup_attr(const ATTR_TYPES type, const uchar_t *name, const u32 name_len,
+		const IGNORE_CASE_BOOL ic, const VCN lowest_vcn, const u8 *val,
+		const u32 val_len, attr_search_context *ctx)
+{
+	ntfs_inode *base_ni;
+
+	ntfs_debug("Entering.");
+	if (ctx->base_ntfs_ino)
+		base_ni = ctx->base_ntfs_ino;
+	else
+		base_ni = ctx->ntfs_ino;
+	/* Sanity check, just for debugging really. */
+	BUG_ON(!base_ni);
+	if (!NInoAttrList(base_ni))
+		return find_attr(type, name, name_len, ic, val, val_len, ctx);
+	return find_external_attr(type, name, name_len, ic, lowest_vcn, val,
+			val_len, ctx);
+}
+
+/**
+ * init_attr_search_ctx - initialize an attribute search context
+ * @ctx:	attribute search context to initialize
+ * @ni:		ntfs inode with which to initialize the search context
+ * @mrec:	mft record with which to initialize the search context
+ *
+ * Initialize the attribute search context @ctx with @ni and @mrec.
+ */
+static inline void init_attr_search_ctx(attr_search_context *ctx,
+		ntfs_inode *ni, MFT_RECORD *mrec)
+{
+	ctx->mrec = mrec;
+	/* Sanity checks are performed elsewhere. */
+	ctx->attr = (ATTR_RECORD*)((u8*)mrec + le16_to_cpu(mrec->attrs_offset));
+	ctx->is_first = TRUE;
+	ctx->ntfs_ino = ni;
+	ctx->al_entry = NULL;
+	ctx->base_ntfs_ino = NULL;
+	ctx->base_mrec = NULL;
+	ctx->base_attr = NULL;
+}
+
+/**
+ * reinit_attr_search_ctx - reinitialize an attribute search context
+ * @ctx:	attribute search context to reinitialize
+ *
+ * Reinitialize the attribute search context @ctx, unmapping an associated
+ * extent mft record if present, and initialize the search context again.
+ *
+ * This is used when a search for a new attribute is being started to reset
+ * the search context to the beginning.
+ */
+void reinit_attr_search_ctx(attr_search_context *ctx)
+{
+	if (likely(!ctx->base_ntfs_ino)) {
+		/* No attribute list. */
+		ctx->is_first = TRUE;
+		/* Sanity checks are performed elsewhere. */
+		ctx->attr = (ATTR_RECORD*)((u8*)ctx->mrec +
+				le16_to_cpu(ctx->mrec->attrs_offset));
+		return;
+	} /* Attribute list. */
+	if (ctx->ntfs_ino != ctx->base_ntfs_ino)
+		unmap_mft_record(READ, ctx->ntfs_ino);
+	init_attr_search_ctx(ctx, ctx->base_ntfs_ino, ctx->base_mrec);
+	return;
+}
+
+/**
+ * get_attr_search_ctx - allocate and initialize a new attribute search context
+ * @ni:		ntfs inode with which to initialize the search context
+ * @mrec:	mft record with which to initialize the search context
+ *
+ * Allocate a new attribute search context, initialize it with @ni and @mrec,
+ * and return it. Return NULL if allocation failed.
+ */
+attr_search_context *get_attr_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
+{
+	attr_search_context *ctx;
+
+	ctx = kmem_cache_alloc(ntfs_attr_ctx_cache, SLAB_NOFS);
+	if (ctx)
+		init_attr_search_ctx(ctx, ni, mrec);
+	return ctx;
+}
+
+/**
+ * put_attr_search_ctx - release an attribute search context
+ * @ctx:	attribute search context to free
+ *
+ * Release the attribute search context @ctx, unmapping an associated extent
+ * mft record if present.
+ */
+void put_attr_search_ctx(attr_search_context *ctx)
+{
+	if (ctx->base_ntfs_ino && ctx->ntfs_ino != ctx->base_ntfs_ino)
+		unmap_mft_record(READ, ctx->ntfs_ino);
+	kmem_cache_free(ntfs_attr_ctx_cache, ctx);
+	return;
+}
+
diff -Nur linux/fs/ntfs/attrib.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attrib.h
--- linux/fs/ntfs/attrib.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/attrib.h	Mon May  6 23:16:24 2002
@@ -0,0 +1,106 @@
+/*
+ * attrib.h - Defines for attribute handling in NTFS Linux kernel driver.
+ *	      Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LINUX_NTFS_ATTRIB_H
+#define _LINUX_NTFS_ATTRIB_H
+
+#include <linux/fs.h>
+
+#include "endian.h"
+#include "types.h"
+#include "layout.h"
+
+static inline void init_run_list(run_list *rl)
+{
+	rl->rl = NULL;
+	init_rwsem(&rl->lock);
+}
+
+typedef enum {
+	LCN_HOLE		= -1,	/* Keep this as highest value or die! */
+	LCN_RL_NOT_MAPPED	= -2,
+	LCN_ENOENT		= -3,
+	LCN_EINVAL		= -4,
+} LCN_SPECIAL_VALUES;
+
+/**
+ * attr_search_context - used in attribute search functions
+ * @mrec:	buffer containing mft record to search
+ * @attr:	attribute record in @mrec where to begin/continue search
+ * @is_first:	if true lookup_attr() begins search with @attr, else after @attr
+ *
+ * Structure must be initialized to zero before the first call to one of the
+ * attribute search functions. Initialize @mrec to point to the mft record to
+ * search, and @attr to point to the first attribute within @mrec (not necessary
+ * if calling the _first() functions), and set @is_first to TRUE (not necessary
+ * if calling the _first() functions).
+ *
+ * If @is_first is TRUE, the search begins with @attr. If @is_first is FALSE,
+ * the search begins after @attr. This is so that, after the first call to one
+ * of the search attribute functions, we can call the function again, without
+ * any modification of the search context, to automagically get the next
+ * matching attribute.
+ */
+typedef struct {
+	MFT_RECORD *mrec;
+	ATTR_RECORD *attr;
+	BOOL is_first;
+	ntfs_inode *ntfs_ino;
+	ATTR_LIST_ENTRY *al_entry;
+	ntfs_inode *base_ntfs_ino;
+	MFT_RECORD *base_mrec;
+	ATTR_RECORD *base_attr;
+} attr_search_context;
+
+extern run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+		const ATTR_RECORD *attr, run_list_element *old_rl);
+
+extern int map_run_list(ntfs_inode *ni, VCN vcn);
+
+extern LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn);
+
+extern BOOL find_attr(const ATTR_TYPES type, const uchar_t *name,
+		const u32 name_len, const IGNORE_CASE_BOOL ic, const u8 *val,
+		const u32 val_len, attr_search_context *ctx);
+
+BOOL lookup_attr(const ATTR_TYPES type, const uchar_t *name, const u32 name_len,
+		const IGNORE_CASE_BOOL ic, const VCN lowest_vcn, const u8 *val,
+		const u32 val_len, attr_search_context *ctx);
+
+extern int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al,
+		const s64 size, const s64 initialized_size);
+
+static inline s64 attribute_value_length(const ATTR_RECORD *a)
+{
+	if (!a->non_resident)
+		return (s64)le32_to_cpu(a->_ARA(value_length));
+	return sle64_to_cpu(a->_ANR(data_size));
+}
+
+extern void reinit_attr_search_ctx(attr_search_context *ctx);
+extern attr_search_context *get_attr_search_ctx(ntfs_inode *ni,
+		MFT_RECORD *mrec);
+extern void put_attr_search_ctx(attr_search_context *ctx);
+
+#endif /* _LINUX_NTFS_ATTRIB_H */
+
diff -Nur linux/fs/ntfs/compress.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/compress.c
--- linux/fs/ntfs/compress.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/compress.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,854 @@
+/**
+ * compress.c - NTFS kernel compressed attributes handling.
+ *		Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/locks.h>
+#include <linux/fs.h>
+
+#include "ntfs.h"
+
+/**
+ * ntfs_compression_constants - enum of constants used in the compression code
+ */
+typedef enum {
+	/* Token types and access mask. */
+	NTFS_SYMBOL_TOKEN	=	0,
+	NTFS_PHRASE_TOKEN	=	1,
+	NTFS_TOKEN_MASK		=	1,
+
+	/* Compression sub-block constants. */
+	NTFS_SB_SIZE_MASK	=	0x0fff,
+	NTFS_SB_SIZE		=	0x1000,
+	NTFS_SB_IS_COMPRESSED	=	0x8000,
+
+	/*
+	 * The maximum compression block size is by definition 16 * the cluster
+	 * size, with the maximum supported cluster size being 4kiB. Thus the
+	 * maximum compression buffer size is 64kiB, so we use this when
+	 * initializing the per-CPU buffers.
+	 */
+	NTFS_MAX_CB_SIZE	= 64 * 1024,
+} ntfs_compression_constants;
+
+/**
+ * ntfs_compression_buffers - per-CPU buffers for the decompression engine.
+ */
+static u8 **ntfs_compression_buffers = NULL;
+
+/**
+ * allocate_compression_buffers - allocate the per-CPU decompression buffers
+ *
+ * Allocate the per-CPU buffers for the decompression engine.
+ *
+ * Caller has to hold the ntfs_lock semaphore.
+ *
+ * Return 0 on success or -ENOMEM if the allocations failed.
+ */
+int allocate_compression_buffers(void)
+{
+	int i, j;
+
+	BUG_ON(ntfs_compression_buffers);
+
+	ntfs_compression_buffers =  (u8**)kmalloc(smp_num_cpus * sizeof(u8*),
+			GFP_KERNEL);
+	if (!ntfs_compression_buffers)
+		return -ENOMEM;
+	for (i = 0; i < smp_num_cpus; i++) {
+		ntfs_compression_buffers[i] = (u8*)vmalloc(NTFS_MAX_CB_SIZE);
+		if (!ntfs_compression_buffers[i])
+			break;
+	}
+	if (i == smp_num_cpus)
+		return 0;
+	/* Allocation failed, cleanup and return error. */
+	for (j = 0; j < i; j++)
+		vfree(ntfs_compression_buffers[j]);
+	kfree(ntfs_compression_buffers);
+	return -ENOMEM;
+}
+
+/**
+ * free_compression_buffers - free the per-CPU decompression buffers
+ *
+ * Free the per-CPU buffers used by the decompression engine.
+ *
+ * Caller has to hold the ntfs_lock semaphore.
+ */
+void free_compression_buffers(void)
+{
+	int i;
+
+	BUG_ON(!ntfs_compression_buffers);
+
+	for (i = 0; i < smp_num_cpus; i++)
+		vfree(ntfs_compression_buffers[i]);
+	kfree(ntfs_compression_buffers);
+	ntfs_compression_buffers = NULL;
+}
+
+/**
+ * ntfs_decompress - decompress a compression block into an array of pages
+ * @dest_pages:		destination array of pages
+ * @dest_index:		current index into @dest_pages (IN/OUT)
+ * @dest_ofs:		current offset within @dest_pages[@dest_index] (IN/OUT)
+ * @dest_max_index:	maximum index into @dest_pages (IN)
+ * @dest_max_ofs:	maximum offset within @dest_pages[@dest_max_index] (IN)
+ * @xpage:		the target page (-1 if none) (IN)
+ * @xpage_done:		set to 1 if xpage was completed successfully (IN/OUT)
+ * @cb_start:		compression block to decompress (IN)
+ * @cb_size:		size of compression block @cb_start in bytes (IN)
+ *
+ * This decompresses the compression block @cb_start into the array of
+ * destination pages @dest_pages starting at index @dest_index into @dest_pages
+ * and at offset @dest_pos into the page @dest_pages[@dest_index].
+ *
+ * When the page @dest_pages[@xpage] is completed, @xpage_done is set to 1.
+ * If xpage is -1 or @xpage has not been completed, @xpage_done is not modified.
+ *
+ * @cb_start is a pointer to the compression block which needs decompressing
+ * and @cb_size is the size of @cb_start in bytes (8-64kiB).
+ *
+ * Return 0 if success or -EOVERFLOW on error in the compressed stream.
+ * @xpage_done indicates whether the target page (@dest_pages[@xpage]) was
+ * completed during the decompression of the compression block (@cb_start).
+ *
+ * Warning: This function *REQUIRES* PAGE_CACHE_SIZE >= 4096 or it will blow up
+ * unpredicatbly! You have been warned!
+ *
+ * Note to hackers: This function may not sleep until it has finished accessing
+ * the compression block @cb_start as it is a per-CPU buffer.
+ */
+static int ntfs_decompress(struct page *dest_pages[], int *dest_index,
+		int *dest_ofs, const int dest_max_index, const int dest_max_ofs,
+		const int xpage, char *xpage_done, u8 *const cb_start,
+		const u32 cb_size)
+{
+	/*
+	 * Pointers into the compressed data, i.e. the compression block (cb),
+	 * and the therein contained sub-blocks (sb).
+	 */
+	u8 *cb_end = cb_start + cb_size; /* End of cb. */
+	u8 *cb = cb_start;	/* Current position in cb. */
+	u8 *cb_sb_start = cb;	/* Beginning of the current sb in the cb. */
+	u8 *cb_sb_end;		/* End of current sb / beginning of next sb. */
+
+	/* Variables for uncompressed data / destination. */
+	struct page *dp;	/* Current destination page being worked on. */
+	u8 *dp_addr;		/* Current pointer into dp. */
+	u8 *dp_sb_start;	/* Start of current sub-block in dp. */
+	u8 *dp_sb_end;		/* End of current sb in dp (dp_sb_start +
+				   NTFS_SB_SIZE). */
+	u16 do_sb_start;	/* @dest_ofs when starting this sub-block. */
+	u16 do_sb_end;		/* @dest_ofs of end of this sb (do_sb_start +
+				   NTFS_SB_SIZE). */
+
+	/* Variables for tag and token parsing. */
+	u8 tag;			/* Current tag. */
+	int token;		/* Loop counter for the eight tokens in tag. */
+
+	/* Need this because we can't sleep, so need two stages. */
+	int completed_pages[dest_max_index - *dest_index + 1];
+	int nr_completed_pages = 0;
+
+	/* Default error code. */
+	int err = -EOVERFLOW;
+	
+	ntfs_debug("Entering, cb_size = 0x%x.", cb_size);
+do_next_sb:
+	ntfs_debug("Beginning sub-block at offset = 0x%x in the cb.",
+			cb - cb_start);
+
+	/* Have we reached the end of the compression block? */
+	if (cb == cb_end || !le16_to_cpup(cb)) {
+		int i;
+
+		ntfs_debug("Completed. Returning success (0).");
+		err = 0;
+return_error:
+		/* Second stage: finalize completed pages. */
+		for (i = 0; i < nr_completed_pages; i++) {
+			int di = completed_pages[i];
+
+			dp = dest_pages[di];
+			flush_dcache_page(dp);
+			kunmap(dp);
+			SetPageUptodate(dp);
+			UnlockPage(dp);
+			if (di == xpage)
+				*xpage_done = 1;
+			else
+				page_cache_release(dp);
+			dest_pages[di] = NULL;
+		}
+		return err;
+	}
+
+	/* Setup offsets for the current sub-block destination. */
+	do_sb_start = *dest_ofs;
+	do_sb_end = do_sb_start + NTFS_SB_SIZE;
+	
+	/* Check that we are still within allowed boundaries. */
+	if (*dest_index == dest_max_index && do_sb_end > dest_max_ofs)
+		goto return_overflow;
+
+	/* Does the minimum size of a compressed sb overflow valid range? */
+	if (cb + 6 > cb_end)
+		goto return_overflow;
+
+	/* Setup the current sub-block source pointers and validate range. */
+	cb_sb_start = cb;
+	cb_sb_end = cb_sb_start + (le16_to_cpup(cb) & NTFS_SB_SIZE_MASK) + 3;
+	if (cb_sb_end > cb_end)
+		goto return_overflow;
+
+	/* Get the current destination page. */
+	dp = dest_pages[*dest_index];
+	if (!dp) {
+		/* No page present. Skip decompression of this sub-block. */
+		cb = cb_sb_end;
+
+		/* Advance destination position to next sub-block. */
+		*dest_ofs = (*dest_ofs + NTFS_SB_SIZE) & ~PAGE_CACHE_MASK;
+		if (!*dest_ofs && (++*dest_index > dest_max_index))
+			goto return_overflow;
+		goto do_next_sb;
+	}
+
+	/* We have a valid destination page. Setup the destination pointers. */
+	dp_addr = (u8*)page_address(dp) + do_sb_start;
+
+	/* Now, we are ready to process the current sub-block (sb). */
+	if (!(le16_to_cpup(cb) & NTFS_SB_IS_COMPRESSED)) {
+		ntfs_debug("Found uncompressed sub-block.");
+		/* This sb is not compressed, just copy it into destination. */
+
+		/* Advance source position to first data byte. */
+		cb += 2;
+
+		/* An uncompressed sb must be full size. */
+		if (cb_sb_end - cb != NTFS_SB_SIZE)
+			goto return_overflow;
+
+		/* Copy the block and advance the source position. */
+		memcpy(dp_addr, cb, NTFS_SB_SIZE);
+		cb += NTFS_SB_SIZE;
+
+		/* Advance destination position to next sub-block. */
+		*dest_ofs += NTFS_SB_SIZE;
+		if (!(*dest_ofs &= ~PAGE_CACHE_MASK)) {
+finalize_page:
+			/*
+			 * First stage: add current page index to array of
+			 * completed pages.
+			 */
+			completed_pages[nr_completed_pages++] = *dest_index;
+			if (++*dest_index > dest_max_index)
+				goto return_overflow;
+		}
+		goto do_next_sb;
+	}
+	ntfs_debug("Found compressed sub-block.");
+	/* This sb is compressed, decompress it into destination. */
+
+	/* Setup destination pointers. */
+	dp_sb_start = dp_addr;
+	dp_sb_end = dp_sb_start + NTFS_SB_SIZE;
+
+	/* Forward to the first tag in the sub-block. */
+	cb += 2;
+do_next_tag:
+	if (cb == cb_sb_end) {
+		/* Check if the decompressed sub-block was not full-length. */
+		if (dp_addr < dp_sb_end) {
+			int nr_bytes = do_sb_end - *dest_ofs;
+
+			ntfs_debug("Filling incomplete sub-block with "
+					"zeroes.");
+			/* Zero remainder and update destination position. */
+			memset(dp_addr, 0, nr_bytes);
+			*dest_ofs += nr_bytes;
+		}
+		/* We have finished the current sub-block. */
+		if (!(*dest_ofs &= ~PAGE_CACHE_MASK))
+			goto finalize_page;
+		goto do_next_sb;
+	}
+
+	/* Check we are still in range. */
+	if (cb > cb_sb_end || dp_addr > dp_sb_end)
+		goto return_overflow;
+
+	/* Get the next tag and advance to first token. */
+	tag = *cb++;
+
+	/* Parse the eight tokens described by the tag. */
+	for (token = 0; token < 8; token++, tag >>= 1) {
+		u16 lg, pt, length, max_non_overlap;
+		register u16 i;
+		u8 *dp_back_addr;
+
+		/* Check if we are done / still in range. */
+		if (cb >= cb_sb_end || dp_addr > dp_sb_end)
+			break;
+
+		/* Determine token type and parse appropriately.*/
+		if ((tag & NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) {
+			/*
+			 * We have a symbol token, copy the symbol across, and
+			 * advance the source and destination positions.
+			 */
+			*dp_addr++ = *cb++;
+			++*dest_ofs;
+
+			/* Continue with the next token. */
+			continue;
+		}
+
+		/* 
+		 * We have a phrase token. Make sure it is not the first tag in
+		 * the sb as this is illegal and would confuse the code below.
+		 */
+		if (dp_addr == dp_sb_start)
+			goto return_overflow;
+
+		/*
+		 * Determine the number of bytes to go back (p) and the number
+		 * of bytes to copy (l). We use an optimized algorithm in which
+		 * we first calculate log2(current destination position in sb),
+		 * which allows determination of l and p in O(1) rather than
+		 * O(n). We just need an arch-optimized log2() function now.
+		 */
+		lg = 0;
+		for (i = *dest_ofs - do_sb_start - 1; i >= 0x10; i >>= 1)
+			lg++;
+
+		/* Get the phrase token into i. */
+		pt = le16_to_cpup(cb);
+
+		/*
+		 * Calculate starting position of the byte sequence in
+		 * the destination using the fact that p = (pt >> (12 - lg)) + 1
+		 * and make sure we don't go too far back.
+		 */
+		dp_back_addr = dp_addr - (pt >> (12 - lg)) - 1;
+		if (dp_back_addr < dp_sb_start)
+			goto return_overflow;
+
+		/* Now calculate the length of the byte sequence. */
+		length = (pt & (0xfff >> lg)) + 3;
+
+		/* Advance destination position and verify it is in range. */
+		*dest_ofs += length;
+		if (*dest_ofs > do_sb_end)
+			goto return_overflow;
+
+		/* The number of non-overlapping bytes. */
+		max_non_overlap = dp_addr - dp_back_addr;
+
+		if (length <= max_non_overlap) {
+			/* The byte sequence doesn't overlap, just copy it. */
+			memcpy(dp_addr, dp_back_addr, length);
+
+			/* Advance destination pointer. */
+			dp_addr += length;
+		} else {
+			/*
+			 * The byte sequence does overlap, copy non-overlapping
+			 * part and then do a slow byte by byte copy for the
+			 * overlapping part. Also, advance the destination
+			 * pointer.
+			 */
+			memcpy(dp_addr, dp_back_addr, max_non_overlap);
+			dp_addr += max_non_overlap;
+			dp_back_addr += max_non_overlap;
+			length -= max_non_overlap;
+			while (length--)
+				*dp_addr++ = *dp_back_addr++;
+		}
+
+		/* Advance source position and continue with the next token. */
+		cb += 2;
+	}
+
+	/* No tokens left in the current tag. Continue with the next tag. */
+	goto do_next_tag;
+
+return_overflow:
+	ntfs_error(NULL, "Failed. Returning -EOVERFLOW.\n");
+	goto return_error;
+}
+
+/**
+ * ntfs_file_read_compressed_block - read a compressed block into the page cache
+ * @page:	locked page in the compression block(s) we need to read
+ *
+ * When we are called the page has already been verified to be locked and the
+ * attribute is known to be non-resident, not encrypted, but compressed.
+ *
+ * 1. Determine which compression block(s) @page is in.
+ * 2. Get hold of all pages corresponding to this/these compression block(s).
+ * 3. Read the (first) compression block.
+ * 4. Decompress it into the corresponding pages.
+ * 5. Throw the compressed data away and proceed to 3. for the next compression
+ *    block or return success if no more compression blocks left.
+ *
+ * Warning: We have to be careful what we do about existing pages. They might
+ * have been written to so that we would lose data if we were to just overwrite
+ * them with the out-of-date uncompressed data.
+ *
+ * FIXME: For PAGE_CACHE_SIZE > cb_size we are not doing the Right Thing(TM) at
+ * the end of the file I think. We need to detect this case and zero the out
+ * of bounds remainder of the page in question and mark it as handled. At the
+ * moment we would just return -EIO on such a page. This bug will only become
+ * apparent if pages are above 8kiB and the NTFS volume only uses 512 byte
+ * clusters so is probably not going to be seen by anyone. Still this should
+ * be fixed. (AIA)
+ *
+ * FIXME: Again for PAGE_CACHE_SIZE > cb_size we are screwing up both in
+ * handling sparse and compressed cbs. (AIA)
+ *
+ * FIXME: At the moment we don't do any zeroing out in the case that
+ * initialized_size is less than data_size. This should be safe because of the
+ * nature of the compression algorithm used. Just in case we check and output
+ * an error message in read inode if the two sizes are not equal for a
+ * compressed file.
+ */
+int ntfs_file_read_compressed_block(struct page *page)
+{
+	struct address_space *mapping = page->mapping;
+	ntfs_inode *ni = NTFS_I(mapping->host);
+	ntfs_volume *vol = ni->vol;
+	kdev_t dev = vol->sb->s_dev;
+	unsigned long block_size = vol->sb->s_blocksize;
+	unsigned char block_size_bits = vol->sb->s_blocksize_bits;
+	u8 *cb, *cb_pos, *cb_end;
+	struct buffer_head **bhs;
+	unsigned long offset, index = page->index;
+	u32 cb_size = ni->_ICF(compression_block_size);
+	u64 cb_size_mask = cb_size - 1UL;
+	VCN vcn;
+	LCN lcn;
+	/* The first wanted vcn (minimum alignment is PAGE_CACHE_SIZE). */
+	VCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >>
+			vol->cluster_size_bits;
+	/*
+	 * The first vcn after the last wanted vcn (minumum alignment is again
+	 * PAGE_CACHE_SIZE.
+	 */
+	VCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1)
+			& ~cb_size_mask) >> vol->cluster_size_bits;
+	/* Number of compression blocks (cbs) in the wanted vcn range. */
+	unsigned int nr_cbs = (end_vcn - start_vcn) << vol->cluster_size_bits
+			>> ni->_ICF(compression_block_size_bits);
+	/*
+	 * Number of pages required to store the uncompressed data from all
+	 * compression blocks (cbs) overlapping @page. Due to alignment
+	 * guarantees of start_vcn and end_vcn, no need to round up here.
+	 */
+	unsigned int nr_pages = (end_vcn - start_vcn) <<
+			vol->cluster_size_bits >> PAGE_CACHE_SHIFT;
+	unsigned int xpage, max_page, cur_page, cur_ofs, i;
+	unsigned int cb_clusters, cb_max_ofs;
+	int block, max_block, cb_max_page, bhs_size, nr_bhs, err = 0;
+	struct page **pages;
+	unsigned char xpage_done = 0;
+
+	ntfs_debug("Entering, page->index = 0x%lx, cb_size = 0x%x, nr_pages = "
+			"%i.", index, cb_size, nr_pages);
+
+	pages = kmalloc(nr_pages * sizeof(struct page *), GFP_NOFS);
+
+	/* Allocate memory to store the buffer heads we need. */
+	bhs_size = cb_size / block_size * sizeof(struct buffer_head *);
+	bhs = kmalloc(bhs_size, GFP_NOFS);
+
+	if (unlikely(!pages || !bhs)) {
+		kfree(bhs);
+		kfree(pages);
+		SetPageError(page);
+		UnlockPage(page);
+		ntfs_error(vol->sb, "Failed to allocate internal buffers.");
+		return -ENOMEM;
+	}
+
+	/*
+	 * We have already been given one page, this is the one we must do.
+	 * Once again, the alignment guarantees keep it simple.
+	 */
+	offset = start_vcn << vol->cluster_size_bits >> PAGE_CACHE_SHIFT;
+	xpage = index - offset;
+	pages[xpage] = page;
+	/*
+	 * The remaining pages need to be allocated and inserted into the page
+	 * cache, alignment guarantees keep all the below much simpler. (-8
+	 */
+	max_page = ((VFS_I(ni)->i_size + PAGE_CACHE_SIZE - 1) >>
+			PAGE_CACHE_SHIFT) - offset;
+	if (nr_pages < max_page)
+		max_page = nr_pages;
+	for (i = 0; i < max_page; i++, offset++) {
+		if (i != xpage)
+			pages[i] = grab_cache_page_nowait(mapping, offset);
+		page = pages[i];
+		if (page) {
+			/*
+			 * We only (re)read the page if it isn't already read
+			 * in and/or dirty or we would be losing data or at
+			 * least wasting our time.
+			 */
+			if (!PageDirty(page) && (!Page_Uptodate(page) ||
+					PageError(page))) {
+				ClearPageError(page);
+				kmap(page);
+				continue;
+			}
+			UnlockPage(page);
+			page_cache_release(page);
+			pages[i] = NULL;
+		}
+	}
+
+	/*
+	 * We have the run list, and all the destination pages we need to fill.
+	 * Now read the first compression block.
+	 */
+	cur_page = 0;
+	cur_ofs = 0;
+	cb_clusters = ni->_ICF(compression_block_clusters);
+do_next_cb:
+	nr_cbs--;
+	nr_bhs = 0;
+
+	/* Read all cb buffer heads one cluster at a time. */
+	for (vcn = start_vcn, start_vcn += cb_clusters; vcn < start_vcn;
+			vcn++) {
+		BOOL is_retry = FALSE;
+retry_remap:
+		/* Find lcn of vcn and convert it into blocks. */
+		down_read(&ni->run_list.lock);
+		lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+		up_read(&ni->run_list.lock);
+		ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
+				(long long)vcn, (long long)lcn);
+		if (lcn < 0) {
+			/*
+			 * When we reach the first sparse cluster we have
+			 * finished with the cb.
+			 */
+			if (lcn == LCN_HOLE)
+				break;
+			if (is_retry || lcn != LCN_RL_NOT_MAPPED)
+				goto rl_err;
+			is_retry = TRUE;
+			/* Map run list of current extent and retry. */
+			if (!map_run_list(ni, vcn))
+				goto retry_remap;
+			goto map_rl_err;
+		}
+		block = lcn << vol->cluster_size_bits >> block_size_bits;
+		/* Read the lcn from device in chunks of block_size bytes. */
+		max_block = block + (vol->cluster_size >> block_size_bits);
+		do {
+			ntfs_debug("block = 0x%x.", block);
+			if (unlikely(!(bhs[nr_bhs] = getblk(dev, block,
+					block_size))))
+				goto getblk_err;
+			nr_bhs++;
+		} while (++block < max_block);
+	}
+
+	/* Setup and initiate io on all buffer heads. */
+	for (i = 0; i < nr_bhs; i++) {
+		struct buffer_head *tbh = bhs[i];
+
+		if (buffer_uptodate(tbh))
+			continue;
+
+		lock_buffer(tbh);
+		get_bh(tbh);
+		tbh->b_end_io = end_buffer_io_sync;
+		submit_bh(READ, tbh);
+	}
+
+	/* Wait for io completion on all buffer heads. */
+	for (i = 0; i < nr_bhs; i++) {
+		struct buffer_head *tbh = bhs[i];
+
+		if (buffer_uptodate(tbh))
+			continue;
+
+		wait_on_buffer(tbh);
+		if (!buffer_uptodate(tbh))
+			goto read_err;
+	}
+
+	/*
+	 * Get the compression buffer corresponding to the current CPU. We must
+	 * not sleep any more until we are finished with the compression buffer.
+	 */
+	cb = ntfs_compression_buffers[smp_processor_id()];
+
+	BUG_ON(!cb);
+
+	cb_pos = cb;
+	cb_end = cb + cb_size;
+
+	/* Copy the buffer heads into the contiguous buffer. */
+	for (i = 0; i < nr_bhs; i++) {
+		memcpy(cb_pos, bhs[i]->b_data, block_size);
+		cb_pos += block_size;
+	}
+
+	/* Just a precaution. */
+	if (cb_pos + 2 <= cb + cb_size)
+		*(u16*)cb_pos = 0;
+
+	/* Reset cb_pos back to the beginning. */
+	cb_pos = cb;
+
+	/* We now have both source (if present) and destination. */
+	ntfs_debug("Successfully read the compression block.");
+
+	/* The last page and maximum offset within it for the current cb. */
+	cb_max_page = (cur_page << PAGE_CACHE_SHIFT) + cur_ofs + cb_size;
+	cb_max_ofs = cb_max_page & ~PAGE_CACHE_MASK;
+	cb_max_page >>= PAGE_CACHE_SHIFT;
+
+	/* Catch end of file inside a compression block. */
+	if (cb_max_page > max_page)
+		cb_max_page = max_page;
+
+	if (vcn == start_vcn - cb_clusters) {
+		/* Sparse cb, zero out page range overlapping the cb. */
+		ntfs_debug("Found sparse compression block.");
+		if (cb_max_ofs)
+			cb_max_page--;
+		for (; cur_page < cb_max_page; cur_page++) {
+			page = pages[cur_page];
+			if (page) {
+				/*
+				 * FIXME: Using clear_page() will become wrong
+				 * when we get PAGE_CACHE_SIZE != PAGE_SIZE but
+				 * for now there is no problem.
+				 */
+				if (likely(!cur_ofs))
+					clear_page(page_address(page));
+				else
+					memset(page_address(page) + cur_ofs, 0,
+							PAGE_CACHE_SIZE -
+							cur_ofs);
+				flush_dcache_page(page);
+				kunmap(page);
+				SetPageUptodate(page);
+				UnlockPage(page);
+				if (cur_page == xpage)
+					xpage_done = 1;
+				else
+					page_cache_release(page);
+				pages[cur_page] = NULL;
+			}
+			cb_pos += PAGE_CACHE_SIZE - cur_ofs;
+			cur_ofs = 0;
+			if (cb_pos >= cb_end)
+				break;
+		}
+		/* If we have a partial final page, deal with it now. */
+		if (cb_max_ofs && cb_pos < cb_end) {
+			page = pages[cur_page];
+			if (page)
+				memset(page_address(page) + cur_ofs, 0,
+						cb_max_ofs - cur_ofs);
+			cb_pos += cb_max_ofs - cur_ofs;
+			cur_ofs = cb_max_ofs;
+		}
+	} else if (vcn == start_vcn) {
+		/* We can't sleep so we need two stages. */
+		unsigned int cur2_page = cur_page;
+		unsigned int cur_ofs2 = cur_ofs;
+		u8 *cb_pos2 = cb_pos;
+
+		ntfs_debug("Found uncompressed compression block.");
+		/* Uncompressed cb, copy it to the destination pages. */
+		/*
+		 * TODO: As a big optimization, we could detect this case
+		 * before we read all the pages and use block_read_full_page()
+		 * on all full pages instead (we still have to treat partial
+		 * pages especially but at least we are getting rid of the
+		 * synchronous io for the majority of pages.
+		 * Or if we choose not to do the read-ahead/-behind stuff, we
+		 * could just return block_read_full_page(pages[xpage]) as long
+		 * as PAGE_CACHE_SIZE <= cb_size.
+		 */
+		if (cb_max_ofs)
+			cb_max_page--;
+		/* First stage: copy data into destination pages. */
+		for (; cur_page < cb_max_page; cur_page++) {
+			page = pages[cur_page];
+			if (page)
+				memcpy(page_address(page) + cur_ofs, cb_pos,
+						PAGE_CACHE_SIZE - cur_ofs);
+			cb_pos += PAGE_CACHE_SIZE - cur_ofs;
+			cur_ofs = 0;
+			if (cb_pos >= cb_end)
+				break;
+		}
+		/* If we have a partial final page, deal with it now. */
+		if (cb_max_ofs && cb_pos < cb_end) {
+			page = pages[cur_page];
+			if (page)
+				memcpy(page_address(page) + cur_ofs, cb_pos,
+						cb_max_ofs - cur_ofs);
+			cb_pos += cb_max_ofs - cur_ofs;
+			cur_ofs = cb_max_ofs;
+		}
+		/* Second stage: finalize pages. */
+		for (; cur2_page < cb_max_page; cur2_page++) {
+			page = pages[cur2_page];
+			if (page) {
+				flush_dcache_page(page);
+				kunmap(page);
+				SetPageUptodate(page);
+				UnlockPage(page);
+				if (cur2_page == xpage)
+					xpage_done = 1;
+				else
+					page_cache_release(page);
+				pages[cur2_page] = NULL;
+			}
+			cb_pos2 += PAGE_CACHE_SIZE - cur_ofs2;
+			cur_ofs2 = 0;
+			if (cb_pos2 >= cb_end)
+				break;
+		}
+	} else {
+		/* Compressed cb, decompress it into the destination page(s). */
+		unsigned int prev_cur_page = cur_page;
+
+		ntfs_debug("Found compressed compression block.");
+		err = ntfs_decompress(pages, &cur_page, &cur_ofs,
+				cb_max_page, cb_max_ofs, xpage, &xpage_done,
+				cb_pos,	cb_size - (cb_pos - cb));
+		/*
+		 * We can sleep from now on.
+		 */
+		if (err) {
+			ntfs_error(vol->sb, "ntfs_decompress() failed in inode "
+					"0x%Lx with error code %i. Skipping "
+					"this compression block.\n",
+					(unsigned long long)ni->mft_no, -err);
+			/* Release the unfinished pages. */
+			for (; prev_cur_page < cur_page; prev_cur_page++) {
+				page = pages[prev_cur_page];
+				if (page) {
+					if (prev_cur_page == xpage &&
+							!xpage_done)
+						SetPageError(page);
+					flush_dcache_page(page);
+					kunmap(page);
+					UnlockPage(page);
+					if (prev_cur_page != xpage)
+						page_cache_release(page);
+					pages[prev_cur_page] = NULL;
+				}
+			}
+		}
+	}
+
+	/* Release the buffer heads. */
+	for (i = 0; i < nr_bhs; i++)
+		brelse(bhs[i]);
+
+	/* Do we have more work to do? */
+	if (nr_cbs)
+		goto do_next_cb;
+
+	/* We no longer need the list of buffer heads. */
+	kfree(bhs);
+
+	/* Clean up if we have any pages left. Should never happen. */
+	for (cur_page = 0; cur_page < max_page; cur_page++) {
+		page = pages[cur_page];
+		if (page) {
+			ntfs_error(vol->sb, "Still have pages left! "
+					"Terminating them with extreme "
+					"prejudice.");
+			if (cur_page == xpage && !xpage_done)
+				SetPageError(page);
+			flush_dcache_page(page);
+			kunmap(page);
+			UnlockPage(page);
+			if (cur_page != xpage)
+				page_cache_release(page);
+			pages[cur_page] = NULL;
+		}
+	}
+
+	/* We no longer need the list of pages. */
+	kfree(pages);
+
+	/* If we have completed the requested page, we return success. */
+	if (likely(xpage_done))
+		return 0;
+
+	ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ?
+			"EOVERFLOW" : (!err ? "EIO" : "unkown error"));
+	return err < 0 ? err : -EIO;
+
+read_err:
+	ntfs_error(vol->sb, "IO error while reading compressed data.");
+	/* Release the buffer heads. */
+	for (i = 0; i < nr_bhs; i++)
+		brelse(bhs[i]);
+	goto err_out;
+
+map_rl_err:
+	ntfs_error(vol->sb, "map_run_list() failed. Cannot read compression "
+			"block.");
+	goto err_out;
+
+rl_err:
+	ntfs_error(vol->sb, "vcn_to_lcn() failed. Cannot read compression "
+			"block.");
+	goto err_out;
+
+getblk_err:
+	ntfs_error(vol->sb, "getblk() failed. Cannot read compression block.");
+
+err_out:
+	kfree(bhs);
+	for (i = cur_page; i < max_page; i++) {
+		page = pages[i];
+		if (page) {
+			if (i == xpage && !xpage_done)
+				SetPageError(page);
+			flush_dcache_page(page);
+			kunmap(page);
+			UnlockPage(page);
+			if (i != xpage)
+				page_cache_release(page);
+		}
+	}
+	kfree(pages);
+	return -EIO;
+}
+
diff -Nur linux/fs/ntfs/debug.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/debug.c
--- linux/fs/ntfs/debug.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/debug.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,175 @@
+/*
+ * debug.c - NTFS kernel debug support. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "debug.h"
+
+/*
+ * A static buffer to hold the error string being displayed and a spinlock
+ * to protect concurrent accesses to it.
+ */
+static char err_buf[1024];
+static spinlock_t err_buf_lock = SPIN_LOCK_UNLOCKED;
+
+/**
+ * __ntfs_warning - output a warning to the syslog
+ * @function:	name of function outputting the warning
+ * @sb:		super block of mounted ntfs filesystem
+ * @fmt:	warning string containing format specifications
+ * @...:	a variable number of arguments specified in @fmt
+ *
+ * Outputs a warning to the syslog for the mounted ntfs filesystem described
+ * by @sb.
+ *
+ * @fmt and the corresponding @... is printf style format string containing
+ * the warning string and the corresponding format arguments, respectively.
+ *
+ * @function is the name of the function from which __ntfs_warning is being
+ * called.
+ *
+ * Note, you should be using debug.h::ntfs_warning(@sb, @fmt, @...) instead
+ * as this provides the @function parameter automatically.
+ */
+void __ntfs_warning(const char *function, const struct super_block *sb,
+		const char *fmt, ...)
+{
+	va_list args;
+	int flen = 0;
+
+	if (function)
+		flen = strlen(function);
+	spin_lock(&err_buf_lock);
+	va_start(args, fmt);
+	vsnprintf(err_buf, sizeof(err_buf), fmt, args);
+	va_end(args);
+	if (sb)
+		printk(KERN_ERR "NTFS-fs warning (device %s): %s(): %s\n",
+				kdevname(sb->s_dev), flen ? function : "", err_buf);
+	else
+		printk(KERN_ERR "NTFS-fs warning: %s(): %s\n",
+				flen ? function : "", err_buf);
+	spin_unlock(&err_buf_lock);
+}
+
+/**
+ * __ntfs_error - output an error to the syslog
+ * @function:	name of function outputting the error
+ * @sb:		super block of mounted ntfs filesystem
+ * @fmt:	error string containing format specifications
+ * @...:	a variable number of arguments specified in @fmt
+ *
+ * Outputs an error to the syslog for the mounted ntfs filesystem described
+ * by @sb.
+ *
+ * @fmt and the corresponding @... is printf style format string containing
+ * the error string and the corresponding format arguments, respectively.
+ *
+ * @function is the name of the function from which __ntfs_error is being
+ * called.
+ *
+ * Note, you should be using debug.h::ntfs_error(@sb, @fmt, @...) instead
+ * as this provides the @function parameter automatically.
+ */
+void __ntfs_error(const char *function, const struct super_block *sb,
+		const char *fmt, ...)
+{
+	va_list args;
+	int flen = 0;
+
+	if (function)
+		flen = strlen(function);
+	spin_lock(&err_buf_lock);
+	va_start(args, fmt);
+	vsnprintf(err_buf, sizeof(err_buf), fmt, args);
+	va_end(args);
+	if (sb)
+		printk(KERN_ERR "NTFS-fs error (device %s): %s(): %s\n",
+				kdevname(sb->s_dev), flen ? function : "", err_buf);
+	else
+		printk(KERN_ERR "NTFS-fs error: %s(): %s\n",
+				flen ? function : "", err_buf);
+	spin_unlock(&err_buf_lock);
+}
+
+#ifdef DEBUG
+
+/* If 1, output debug messages, and if 0, don't. */
+int debug_msgs = 0;
+
+void __ntfs_debug (const char *file, int line, const char *function,
+		const char *fmt, ...)
+{
+	va_list args;
+	int flen = 0;
+
+	if (!debug_msgs)
+		return;
+	if (function)
+		flen = strlen(function);
+	spin_lock(&err_buf_lock);
+	va_start(args, fmt);
+	vsnprintf(err_buf, sizeof(err_buf), fmt, args);
+	va_end(args);
+	printk(KERN_DEBUG "NTFS-fs DEBUG (%s, %d): %s: %s\n",
+		file, line, flen ? function : "", err_buf);
+	spin_unlock(&err_buf_lock);
+}
+
+/* Dump a run list. Caller has to provide synchronisation for @rl. */
+void ntfs_debug_dump_runlist(const run_list_element *rl)
+{
+	int i;
+	const char *lcn_str[5] = { "LCN_HOLE         ", "LCN_RL_NOT_MAPPED",
+				   "LCN_ENOENT       ", "LCN_EINVAL       ",
+				   "LCN_unknown      " };
+
+	if (!debug_msgs)
+		return;
+	printk(KERN_DEBUG "NTFS-fs DEBUG: Dumping run list (values "
+			"in hex):\n");
+	if (!rl) {
+		printk(KERN_DEBUG "Run list not present.\n");
+		return;
+	}
+	printk(KERN_DEBUG "VCN              LCN               Run length\n");
+	for (i = 0; ; i++) {
+		LCN lcn = (rl + i)->lcn;
+
+		if (lcn < (LCN)0) {
+			int index = -lcn - 1;
+
+			if (index > -LCN_EINVAL - 1)
+				index = 4;
+			printk(KERN_DEBUG "%-16Lx %s %-16Lx%s\n",
+				(rl + i)->vcn, lcn_str[index],
+				(rl + i)->length, (rl + i)->length ?
+				"" : " (run list end)");
+		} else
+			printk(KERN_DEBUG "%-16Lx %-16Lx  %-16Lx%s\n",
+				(rl + i)->vcn, (rl + i)->lcn,
+				(rl + i)->length, (rl + i)->length ?
+				"" : " (run list end)");
+		if (!(rl + i)->length)
+			break;
+	}
+}
+
+#endif
+
diff -Nur linux/fs/ntfs/debug.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/debug.h
--- linux/fs/ntfs/debug.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/debug.h	Mon May  6 23:16:24 2002
@@ -0,0 +1,72 @@
+/*
+ * debug.h - NTFS kernel debug support. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LINUX_NTFS_DEBUG_H
+#define _LINUX_NTFS_DEBUG_H
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/spinlock.h>
+#include <linux/fs.h>
+
+#include "inode.h"
+#include "attrib.h"
+
+#ifdef DEBUG
+
+extern int debug_msgs;
+
+#if 0 /* Fool kernel-doc since it doesn't do macros yet */
+/**
+ * ntfs_debug - write a debug level message to syslog
+ * @f:		a printf format string containing the message
+ * @...:	the variables to substitute into @f
+ *
+ * ntfs_debug() writes a DEBUG level message to the syslog but only if the
+ * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP.
+ */
+static void ntfs_debug(const char *f, ...);
+#endif
+
+extern void __ntfs_debug (const char *file, int line, const char *function,
+	const char *format, ...) __attribute__ ((format (printf, 4, 5)));
+#define ntfs_debug(f, a...)						\
+	__ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a)
+
+extern void ntfs_debug_dump_runlist(const run_list_element *rl);
+
+#else	/* !DEBUG */
+
+#define ntfs_debug(f, a...)		do {} while (0)
+#define ntfs_debug_dump_runlist(rl)	do {} while (0)
+
+#endif	/* !DEBUG */
+
+extern void __ntfs_warning(const char *function, const struct super_block *sb,
+		const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
+#define ntfs_warning(sb, f, a...)	__ntfs_warning(__FUNCTION__, sb, f, ##a)
+
+extern void __ntfs_error(const char *function, const struct super_block *sb,
+		const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
+#define ntfs_error(sb, f, a...)		__ntfs_error(__FUNCTION__, sb, f, ##a)
+
+#endif /* _LINUX_NTFS_DEBUG_H */
+
diff -Nur linux/fs/ntfs/dir.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/dir.c
--- linux/fs/ntfs/dir.c	Sun Nov  4 01:35:46 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/dir.c	Mon May  6 23:16:24 2002
@@ -1,1104 +1,820 @@
-/*
- * dir.c
+/**
+ * dir.c - NTFS kernel directory operations. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Copyright (C) 1995-1997, 1999 Martin von Löwis
- * Copyright (C) 1999 Steve Dodd
- * Copyright (C) 1999 Joseph Malicki
- * Copyright (C) 2001 Anton Altaparmakov (AIA)
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ntfstypes.h"
-#include "struct.h"
-#include "dir.h"
-#include "macros.h"
-
-#include <linux/errno.h>
-#include "super.h"
-#include "inode.h"
-#include "attr.h"
-#include "support.h"
-#include "util.h"
-#include <linux/smp_lock.h>
-#include <linux/bitops.h>
-
-static char I30[] = "$I30";
-
-/* An index record should start with INDX, and the last word in each block
- * should contain the check value. If it passes, the original values need to
- * be restored. */
-int ntfs_check_index_record(ntfs_inode *ino, char *record)
-{
-	return ntfs_fixup_record(record, "INDX", ino->u.index.recordsize);
-}
-
-static inline int ntfs_is_top(ntfs_u64 stack)
-{
-	return stack == 14;
-}
-
-static int ntfs_pop(ntfs_u64 *stack)
-{
-	static int width[16] = {1,2,1,3,1,2,1,4,1,2,1,3,1,2,1,-1};
-	int res = -1;
-	
-	switch (width[*stack & 15]) {
-	case 1:
-		res = (int)((*stack & 15) >> 1);
-		*stack >>= 4;
-		break;
-	case 2:
-		res = (int)(((*stack & 63) >> 2) + 7);
-		*stack >>= 6;
-		break;
-	case 3:
-		res = (int)(((*stack & 255) >> 3) + 23);
-		*stack >>= 8;
-		break;
-	case 4:
-		res = (int)(((*stack & 1023) >> 4) + 55);
-		*stack >>= 10;
-		break;
-	default:
-		ntfs_error("Unknown encoding\n");
-	}
-	return res;
-}
-
-static inline unsigned int ntfs_top(void)
-{
-	return 14;
-}
-
-static ntfs_u64 ntfs_push(ntfs_u64 stack, int i)
-{
-	if (i < 7)
-		return (stack << 4) | (i << 1);
-	if (i < 23)
-		return (stack << 6) | ((i - 7) << 2) | 1;
-	if (i < 55)
-		return (stack << 8) | ((i - 23) << 3) | 3;
-	if (i < 120)
-		return (stack << 10) | ((i - 55) << 4) | 7;
-	ntfs_error("Too many entries\n");
-	return ~((ntfs_u64)0);
-}
-
-#if 0
-static void ntfs_display_stack(ntfs_u64 stack)
-{
-	while(!ntfs_is_top(stack))
-	{
-		printf("%d ", ntfs_pop(&stack));
-	}
-	printf("\n");
-}
-#endif
-
-/* True if the entry points to another block of entries. */
-static inline int ntfs_entry_has_subnodes(char *entry)
-{
-	return (NTFS_GETU16(entry + 0xc) & 1);
-}
+#include "ntfs.h"
 
-/* True if it is not the 'end of dir' entry. */
-static inline int ntfs_entry_is_used(char *entry)
-{
-	return !(NTFS_GETU16(entry + 0xc) & 2);
-}
-
-/*
- * Removed RACE for allocating index blocks. But stil not too happy.
- * There might be more races afterwards. (AIA)
+/**
+ * The little endian Unicode string $I30 as a global constant.
  */
-static int ntfs_allocate_index_block(ntfs_iterate_s *walk)
+const uchar_t I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'),
+		const_cpu_to_le16('3'),	const_cpu_to_le16('0'),
+		const_cpu_to_le16(0) };
+
+/**
+ * ntfs_lookup_inode_by_name - find an inode in a directory given its name
+ * @dir_ni:	ntfs inode of the directory in which to search for the name
+ * @uname:	Unicode name for which to search in the directory
+ * @uname_len:	length of the name @uname in Unicode characters
+ *
+ * Look for an inode with name @uname in the directory with inode @dir_ni.
+ * ntfs_lookup_inode_by_name() walks the contents of the directory looking for
+ * the Unicode name. If the name is found in the directory, the corresponding
+ * inode number (>= 0) is returned as a mft reference in cpu format, i.e. it
+ * is a 64-bit number containing the sequence number.
+ *
+ * On error, a negative value is returned corresponding to the error code. In
+ * particular if the inode is not found -ENOENT is returned. Note that you
+ * can't just check the return value for being negative, you have to check the
+ * inode number for being negative which you can extract using MREC(return
+ * value).
+ *
+ * Note, @uname_len does not include the (optional) terminating NULL character.
+ */
+u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const uchar_t *uname,
+		const int uname_len)
 {
-	ntfs_attribute *allocation, *bitmap = 0;
-	int error, size, i, bit;
-	ntfs_u8 *bmap;
-	ntfs_io io;
-	ntfs_volume *vol = walk->dir->vol;
-
-	/* Check for allocation attribute. */
-	allocation = ntfs_find_attr(walk->dir, vol->at_index_allocation, I30);
-	if (!allocation) {
-		ntfs_u8 bmp[8];
-		/* Create index allocation attribute. */
-		error = ntfs_create_attr(walk->dir, vol->at_index_allocation,
-					 I30, 0, 0, &allocation);
-		if (error)
-			goto err_ret;
-		ntfs_bzero(bmp, sizeof(bmp));
-		error = ntfs_create_attr(walk->dir, vol->at_bitmap, I30, bmp,
-					 sizeof(bmp), &bitmap);
-		if (error)
-			goto err_ret;
-	} else
-		bitmap = ntfs_find_attr(walk->dir, vol->at_bitmap, I30);
-	if (!bitmap) {
-		ntfs_error("Directory w/o bitmap\n");
-		error = -EINVAL;
-		goto err_ret;
-	}
-	size = bitmap->size;
-	bmap = ntfs_malloc(size);
-	if (!bmap) {
-		error = -ENOMEM;
-		goto err_ret;
-	}
-	io.fn_put = ntfs_put;
-	io.fn_get = ntfs_get;
-try_again:
-	io.param = bmap;
-	io.size = size;
-	error = ntfs_read_attr(walk->dir, vol->at_bitmap, I30, 0, &io);
-	if (error || (io.size != size && (error = -EIO, 1)))
-		goto err_fb_out;
-	/* Allocate a bit. */
-	for (bit = i = 0; i < size; i++) {
-		if (bmap[i] == 0xFF)
-			continue;
-		bit = ffz(bmap[i]);
-		if (bit < 8)
-			break;
-	}
-	if (i >= size) {
-		/* FIXME: Extend bitmap. */
-		error = -EOPNOTSUPP;
-		goto err_fb_out;
-	}
-	/* Get the byte containing our bit again, now taking the BKL. */
-	io.param = bmap;
-	io.size = 1;
-	lock_kernel();
-	error = ntfs_read_attr(walk->dir, vol->at_bitmap, I30, i, &io);
-	if (error || (io.size != 1 && (error = -EIO, 1)))
-		goto err_unl_out;
-	if (ntfs_test_and_set_bit(bmap, bit)) {
-		unlock_kernel();
-		/* Give other process(es) a chance to finish. */
-		schedule();
-		goto try_again;
-	}
-	walk->newblock = (i * 8 + bit) * walk->dir->u.index.clusters_per_record;
-	io.param = bmap;
-	error = ntfs_write_attr(walk->dir, vol->at_bitmap, I30, i, &io);
-	if (error || (io.size != size && (error = -EIO, 1)))
-		goto err_unl_out;
-	/* Change inode on disk, required when bitmap is resident. */
-	error = ntfs_update_inode(walk->dir);
-	if (error)
-		goto err_unl_out;
-	unlock_kernel();
-	ntfs_free(bmap);
-	/* Check whether record is out of allocated range. */
-	size = allocation->size;
-	if (walk->newblock * vol->cluster_size >= size) {
-		/* Build index record. */
-		int hsize;
-		int s1 = walk->dir->u.index.recordsize;
-		int nr_fix = (s1 >> vol->sector_size) + 1;
-		char *record = ntfs_malloc(s1);
-		if (!record) {
-			error = -ENOMEM;
-			goto err_ret;
-		}
-		ntfs_bzero(record, s1);
-		/* Magic */
-		ntfs_memcpy(record, "INDX", 4);
-		/* Offset to fixups */
-		NTFS_PUTU16(record + 4, 0x28);
-		/* Number of fixups. */
-		NTFS_PUTU16(record + 6, nr_fix);
-		/* Log file sequence number - We don't do journalling so we
-		 * just set it to zero which should be the Right Thing. (AIA) */
-		NTFS_PUTU64(record + 8, 0);
-		/* VCN of buffer */
-		NTFS_PUTU64(record + 0x10, walk->newblock);
-		/* Header size. */
-		hsize = 0x10 + 2 * nr_fix;
-		hsize = (hsize + 7) & ~7; /* Align. */
-		NTFS_PUTU16(record + 0x18, hsize);
-		/* Total size of record. */
-		NTFS_PUTU32(record + 0x20, s1 - 0x18);
-		/* Writing the data will extend the attribute. */
-		io.param = record;
-		io.size = s1;
-		io.do_read = 0;
-		error = ntfs_readwrite_attr(walk->dir, allocation, size, &io);
-		ntfs_free(record);
-		if (error || (io.size != s1 && (error = -EIO, 1)))
-			goto err_ret;
-		error = ntfs_update_inode(walk->dir);
-		if (error)
-			goto err_ret;
+	ntfs_volume *vol = dir_ni->vol;
+	struct super_block *sb = vol->sb;
+	MFT_RECORD *m;
+	INDEX_ROOT *ir;
+	INDEX_ENTRY *ie;
+	INDEX_ALLOCATION *ia;
+	u8 *index_end;
+	u64 mref;
+	attr_search_context *ctx;
+	int err = 0, rc;
+	IGNORE_CASE_BOOL ic;
+	VCN vcn, old_vcn;
+	struct address_space *ia_mapping;
+	struct page *page;
+	u8 *kaddr;
+
+	/* Get hold of the mft record for the directory. */
+	m = map_mft_record(READ, dir_ni);
+	if (IS_ERR(m))
+		goto map_err_out;
+
+	ctx = get_attr_search_ctx(dir_ni, m);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto unm_err_out;
+	}
+
+	/* Find the index root attribute in the mft record. */
+	if (!lookup_attr(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL, 0,
+			ctx)) {
+		ntfs_error(sb, "Index root attribute missing in directory "
+				"inode 0x%Lx.",
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto put_unm_err_out;
 	}
-	return 0;
-err_unl_out:
-	unlock_kernel();
-err_fb_out:
-	ntfs_free(bmap);
-err_ret:
-	return error;
-}
-
-/* Write an index block (root or allocation) back to storage.
- * Used is the total number of bytes in buf, including all headers. */
-static int ntfs_index_writeback(ntfs_iterate_s *walk, ntfs_u8 *buf, int block,
-				int used)
-{
-	ntfs_io io;
-	int error;
-	ntfs_attribute *a;
-	ntfs_volume *vol = walk->dir->vol;
-	
-	io.fn_put = 0;
-	io.fn_get = ntfs_get;
-	io.param = buf;
-	if (block == -1) {	/* Index root. */
-		NTFS_PUTU16(buf + 0x14, used - 0x10);
-		/* 0x18 is a copy thereof. */
-		NTFS_PUTU16(buf + 0x18, used - 0x10);
-		io.size = used;
-		error = ntfs_write_attr(walk->dir, vol->at_index_root, I30, 0,
-					&io);
-		if (error || (io.size != used && (error = -EIO, 1)))
-			return error;
-		/* Shrink if necessary. */
-		a = ntfs_find_attr(walk->dir, vol->at_index_root, I30);
-		ntfs_resize_attr(walk->dir, a, used);
-	} else {
-		NTFS_PUTU16(buf + 0x1C, used - 0x18);
-		io.size = walk->dir->u.index.recordsize;
-		error = ntfs_insert_fixups(buf, io.size);
-		if (error) {
-			printk(KERN_ALERT "NTFS: ntfs_index_writeback() caught "
-					"corrupt index record ntfs record "
-					"header. Refusing to write corrupt "
-					"data to disk. Unmount and run chkdsk "
-					"immediately!\n");
-			return -EIO;
+	/* Get to the index root value (it's been verified in read_inode). */
+	ir = (INDEX_ROOT*)((u8*)ctx->attr +
+			le16_to_cpu(ctx->attr->_ARA(value_offset)));
+	index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
+	/* The first index entry. */
+	ie = (INDEX_ENTRY*)((u8*)&ir->index +
+			le32_to_cpu(ir->index.entries_offset));
+	/*
+	 * Loop until we exceed valid memory (corruption case) or until we
+	 * reach the last entry.
+	 */
+	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
+		/* Bounds checks. */
+		if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
+				sizeof(INDEX_ENTRY_HEADER) > index_end ||
+				(u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
+				index_end)
+			goto dir_err_out;
+		/*
+		 * The last entry cannot contain a name. It can however contain
+		 * a pointer to a child node in the B+tree so we just break out.
+		 */
+		if (ie->_IEH(flags) & INDEX_ENTRY_END)
+			break;
+		/*
+		 * If the current entry has a name type of POSIX, the name is
+		 * case sensitive and not otherwise. This has the effect of us
+		 * not being able to access any POSIX file names which collate
+		 * after the non-POSIX one when they only differ in case, but
+		 * anyone doing screwy stuff like that deserves to burn in
+		 * hell... Doing that kind of stuff on NT4 actually causes
+		 * corruption on the partition even when using SP6a and Linux
+		 * is not involved at all.
+		 */
+		ic = ie->key.file_name.file_name_type ? IGNORE_CASE :
+				CASE_SENSITIVE;
+		/*
+		 * If the names match perfectly, we are done and return the
+		 * mft reference of the inode (i.e. the inode number together
+		 * with the sequence number for consistency checking. We
+		 * convert it to cpu format before returning.
+		 */
+		if (ntfs_are_names_equal(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, ic,
+				vol->upcase, vol->upcase_len)) {
+found_it:
+			mref = le64_to_cpu(ie->_IIF(indexed_file));
+			put_attr_search_ctx(ctx);
+			unmap_mft_record(READ, dir_ni);
+			return mref;
 		}
-		error = ntfs_write_attr(walk->dir, vol->at_index_allocation,
-				I30, (__s64)block << vol->cluster_size_bits,
-				&io);
-		if (error || (io.size != walk->dir->u.index.recordsize &&
-				(error = -EIO, 1)))
-			return error;
-	}
-	return 0;
-}
-
-static int ntfs_split_record(ntfs_iterate_s *walk, char *start, int bsize,
-			     int usize)
-{
-	char *entry, *prev;
-	ntfs_u8 *newbuf = 0, *middle = 0;
-	int error, othersize, mlen;
-	ntfs_io io;
-	ntfs_volume *vol = walk->dir->vol;
-	int oldblock;
-
-	error = ntfs_allocate_index_block(walk);
-	if (error)
-		return error;
-	/* This should not happen. */
-	if (walk->block == -1) {
-		ntfs_error("Trying to split root");
-		return -EOPNOTSUPP;
-	}
-	entry = start + NTFS_GETU16(start + 0x18) + 0x18; 
-	for (prev = entry; entry - start < usize / 2; 
-					       entry += NTFS_GETU16(entry + 8))
-		prev = entry;
-	newbuf = ntfs_malloc(vol->index_record_size);
-	if (!newbuf)
-		return -ENOMEM;
-	io.fn_put = ntfs_put;
-	io.fn_get = ntfs_get;
-	io.param = newbuf;
-	io.size = vol->index_record_size;
-	/* Read in old header. FIXME: Reading everything is overkill. */
-	error = ntfs_read_attr(walk->dir, vol->at_index_allocation, I30,
-			(__s64)walk->newblock << vol->cluster_size_bits, &io);
-	if (error)
-		goto out;
-	if (io.size != vol->index_record_size) {
-		error = -EIO;
-		goto out;
-	}
-	/* FIXME: Adjust header. */
-	/* Copy everything from entry to new block. */
-	othersize = usize - (entry - start);
-	ntfs_memcpy(newbuf + NTFS_GETU16(newbuf + 0x18) + 0x18, entry,
-								    othersize);
-	/* Copy flags. */
-	NTFS_PUTU32(newbuf + 0x24, NTFS_GETU32(start + 0x24));
-	error = ntfs_index_writeback(walk, newbuf, walk->newblock,
-				othersize + NTFS_GETU16(newbuf + 0x18) + 0x18);
-	if (error)
-		goto out;
-	/* Move prev to walk. */
-	mlen = NTFS_GETU16(prev + 0x8);
-	/* Remember old child node. */
-	if (ntfs_entry_has_subnodes(prev))
-		oldblock = NTFS_GETU32(prev + mlen - 8);
-	else
-		oldblock = -1;
-	/* Allow for pointer to subnode. */
-	middle = ntfs_malloc(ntfs_entry_has_subnodes(prev) ? mlen : mlen + 8);
-	if (!middle){
-		error = -ENOMEM;
-		goto out;
-	}
-	ntfs_memcpy(middle, prev, mlen);
-	/* Set has_subnodes flag. */
-	NTFS_PUTU8(middle + 0xC, NTFS_GETU8(middle + 0xC) | 1);
-	/* Middle entry points to block, parent entry will point to newblock. */
-	NTFS_PUTU64(middle + mlen - 8, walk->block);
-	if (walk->new_entry)
-		ntfs_error("Entry not reset");
-	walk->new_entry = middle;
-	walk->u.flags |= ITERATE_SPLIT_DONE;
-	/* Terminate old block. */
-	othersize = usize - (prev-start);
-	NTFS_PUTU64(prev, 0);
-	if (oldblock == -1) {
-		NTFS_PUTU32(prev + 8, 0x10);
-		NTFS_PUTU32(prev + 0xC, 2);
-		othersize += 0x10;
-	} else {
-		NTFS_PUTU32(prev + 8, 0x18);
-		NTFS_PUTU32(prev + 0xC, 3);
-		NTFS_PUTU64(prev + 0x10, oldblock);
-		othersize += 0x18;
-	}
-	/* Write back original block. */
-	error = ntfs_index_writeback(walk, start, walk->block, othersize);
- out:
-	if (newbuf)
-		ntfs_free(newbuf);
-	if (middle)
-		ntfs_free(middle);
-	return error;
-}
-
-static int ntfs_dir_insert(ntfs_iterate_s *walk, char *start, char* entry)
-{
-	int blocksize, usedsize, error, offset;
-	int do_split = 0;
-	offset = entry - start;
-	if (walk->block == -1) { /* index root */
-		blocksize = walk->dir->vol->mft_record_size;
-		usedsize = NTFS_GETU16(start + 0x14) + 0x10;
-	} else {
-		blocksize = walk->dir->u.index.recordsize;
-		usedsize = NTFS_GETU16(start + 0x1C) + 0x18;
+		/*
+		 * Not a perfect match, need to do full blown collation so we
+		 * know which way in the B+tree we have to go.
+		 */
+		rc = ntfs_collate_names(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, 1,
+				IGNORE_CASE, vol->upcase, vol->upcase_len);
+		/*
+		 * If uname collates before the name of the current entry, there
+		 * is definitely no such name in this index but we might need to
+		 * descend into the B+tree so we just break out of the loop.
+		 */
+		if (rc == -1)
+			break;
+		/* The names are not equal, continue the search. */
+		if (rc)
+			continue;
+		/*
+		 * Names match with case insensitive comparison, now try the
+		 * case sensitive comparison, which is required for proper
+		 * collation.
+		 */
+		rc = ntfs_collate_names(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, 1,
+				CASE_SENSITIVE, vol->upcase, vol->upcase_len);
+		if (rc == -1)
+			break;
+		if (rc)
+			continue;
+		/*
+		 * Perfect match, this will never happen as the
+		 * ntfs_are_names_equal() call will have gotten a match but we
+		 * still treat it correctly.
+		 */
+		goto found_it;
 	}
-	if (usedsize + walk->new_entry_size > blocksize) {
-		char* s1 = ntfs_malloc(blocksize + walk->new_entry_size);
-		if (!s1)
-			return -ENOMEM;
-		ntfs_memcpy(s1, start, usedsize);
-		do_split = 1;
-		/* Adjust entry to s1. */
-		entry = s1 + (entry - start);
-		start = s1;
-	}
-	ntfs_memmove(entry + walk->new_entry_size, entry, usedsize - offset);
-	ntfs_memcpy(entry, walk->new_entry, walk->new_entry_size);
-	usedsize += walk->new_entry_size;
-	ntfs_free(walk->new_entry);
-	walk->new_entry = 0;
-	if (do_split) {
-		error = ntfs_split_record(walk, start, blocksize, usedsize);
-		ntfs_free(start);
-	} else {
-		error = ntfs_index_writeback(walk, start, walk->block,usedsize);
-		if (error)
-			return error;
+	/*
+	 * We have finished with this index without success. Check for the
+	 * presence of a child node.
+	 */
+	if (!(ie->_IEH(flags) & INDEX_ENTRY_NODE)) {
+		/* No child node, return -ENOENT. */
+		err = -ENOENT;
+		goto put_unm_err_out;
+	} /* Child node present, descend into it. */
+	/* Consistency check: Verify that an index allocation exists. */
+	if (!NInoIndexAllocPresent(dir_ni)) {
+		ntfs_error(sb, "No index allocation attribute but index entry "
+				"requires one. Directory inode 0x%Lx is "
+				"corrupt or driver bug.",
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto put_unm_err_out;
 	}
-	return 0;
-}
-
-/* Try to split INDEX_ROOT attributes. Return -E2BIG if nothing changed. */
-int ntfs_split_indexroot(ntfs_inode *ino)
-{
-	ntfs_attribute *ra;
-	ntfs_u8 *root = 0, *index = 0;
-	ntfs_io io;
-	int error, off, i, bsize, isize;
-	ntfs_iterate_s walk;
-
-	ra = ntfs_find_attr(ino, ino->vol->at_index_root, I30);
-	if (!ra)
-		return -ENOTDIR;
-	bsize = ino->vol->mft_record_size;
-	root = ntfs_malloc(bsize);
-	if (!root)
-		return -E2BIG;
-	io.fn_put = ntfs_put;
-	io.param = root;
-	io.size = bsize;
-	error = ntfs_read_attr(ino, ino->vol->at_index_root, I30, 0, &io);
-	if (error)
-		goto out;
-	off = 0x20;
-	/* Count number of entries. */
-	for (i = 0; ntfs_entry_is_used(root + off); i++)
-		off += NTFS_GETU16(root + off + 8);
-	if (i <= 2) {
-		/* We don't split small index roots. */
-		error = -E2BIG;
-		goto out;
-	}
-	index = ntfs_malloc(ino->vol->index_record_size);
-	if (!index) {
-		error = -ENOMEM;
-		goto out;
-	}
-	walk.dir = ino;
-	walk.block = -1;
-	walk.result = walk.new_entry = 0;
-	walk.name = 0;
-	error = ntfs_allocate_index_block(&walk);
-	if (error)
-		goto out;
-	/* Write old root to new index block. */
-	io.param = index;
-	io.size = ino->vol->index_record_size;
-	error = ntfs_read_attr(ino, ino->vol->at_index_allocation, I30,
-		(__s64)walk.newblock << ino->vol->cluster_size_bits, &io);
-	if (error)
-		goto out;
-	isize = NTFS_GETU16(root + 0x18) - 0x10;
-	ntfs_memcpy(index + NTFS_GETU16(index + 0x18) + 0x18, root+0x20, isize);
-	/* Copy flags. */
-	NTFS_PUTU32(index + 0x24, NTFS_GETU32(root + 0x1C));
-	error = ntfs_index_writeback(&walk, index, walk.newblock, 
-				     isize + NTFS_GETU16(index + 0x18) + 0x18);
-	if (error)
-		goto out;
-	/* Mark root as split. */
-	NTFS_PUTU32(root + 0x1C, 1);
-	/* Truncate index root. */
-	NTFS_PUTU64(root + 0x20, 0);
-	NTFS_PUTU32(root + 0x28, 0x18);
-	NTFS_PUTU32(root + 0x2C, 3);
-	NTFS_PUTU64(root + 0x30, walk.newblock);
-	error = ntfs_index_writeback(&walk, root, -1, 0x38);
- out:
-	ntfs_free(root);
-	ntfs_free(index);
-	return error;
-}
-
-/* The entry has been found. Copy the result in the caller's buffer */
-static int ntfs_copyresult(char *dest, char *source)
-{
-	int length = NTFS_GETU16(source + 8);
-	ntfs_memcpy(dest, source, length);
-	return 1;
-}
-
-/* Use $UpCase some day. */
-static inline unsigned short ntfs_my_toupper(ntfs_volume *vol, ntfs_u16 x)
-{
-	/* We should read any pending rest of $UpCase here. */
-	if (x >= vol->upcase_length)
-		return x;
-	return vol->upcase[x];
-}
-
-/* Everything passed in walk and entry. */
-static int ntfs_my_strcmp(ntfs_iterate_s *walk, const unsigned char *entry)
-{
-	int lu = *(entry + 0x50);
-	int i;
-
-	ntfs_u16* name = (ntfs_u16*)(entry + 0x52);
-	ntfs_volume *vol = walk->dir->vol;
-	for (i = 0; i < lu && i < walk->namelen; i++)
-		if (ntfs_my_toupper(vol, NTFS_GETU16(name + i)) != 
-			     ntfs_my_toupper(vol, NTFS_GETU16(walk->name + i)))
-			break;
-	if (i == lu && i == walk->namelen)
-		return 0;
-	if (i == lu)
-		return 1;
-	if (i == walk->namelen)
-		return -1;
-	if (ntfs_my_toupper(vol, NTFS_GETU16(name + i)) < 
-			    ntfs_my_toupper(vol, NTFS_GETU16(walk->name + i)))
-		return 1;
-	return -1;
-}
-
-/* Necessary forward declaration. */
-static int ntfs_getdir_iterate(ntfs_iterate_s *walk, char *start, char *entry);
-
-/* Parse a block of entries. Load the block, fix it up, and iterate over the
- * entries. The block is given as virtual cluster number. */
-static int ntfs_getdir_record(ntfs_iterate_s *walk, int block)
-{
-	int length = walk->dir->u.index.recordsize;
-	char *record = (char*)ntfs_malloc(length);
-	char *offset;
-	int retval,error;
-	int oldblock;
-	ntfs_io io;
-
-	if (!record)
-		return -ENOMEM;
-	io.fn_put = ntfs_put;
-	io.param = record;
-	io.size = length;
-	/* Read the block from the index allocation attribute. */
-	error = ntfs_read_attr(walk->dir, walk->dir->vol->at_index_allocation,
-		I30, (__s64)block << walk->dir->vol->cluster_size_bits, &io);
-	if (error || io.size != length) {
-		ntfs_error("read failed\n");
-		ntfs_free(record);
-		return 0;
+	/* Get the starting vcn of the index_block holding the child node. */
+	vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->_IEH(length)) - 8);
+	ia_mapping = VFS_I(dir_ni)->i_mapping;
+descend_into_child_node:
+	/*
+	 * Convert vcn to index into the index allocation attribute in units
+	 * of PAGE_CACHE_SIZE and map the page cache page, reading it from
+	 * disk if necessary.
+	 */
+	page = ntfs_map_page(ia_mapping, vcn <<
+			dir_ni->_IDM(index_vcn_size_bits) >> PAGE_CACHE_SHIFT);
+	if (IS_ERR(page)) {
+		ntfs_error(sb, "Failed to map directory index page, error %ld.",
+				-PTR_ERR(page));
+		goto put_unm_err_out;
+	}
+	kaddr = (u8*)page_address(page);
+fast_descend_into_child_node:
+	/* Get to the index allocation block. */
+	ia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<
+			dir_ni->_IDM(index_vcn_size_bits)) & ~PAGE_CACHE_MASK));
+	/* Bounds checks. */
+	if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
+		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
+				"inode 0x%Lx or driver bug.",
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto unm_unm_err_out;
 	}
-	if (!ntfs_check_index_record(walk->dir, record)) {
-		ntfs_error("%x is not an index record\n", block);
-		ntfs_free(record);
-		return 0;
+	if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
+		ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+				"different from expected VCN (0x%Lx). "
+				"Directory inode 0x%Lx is corrupt or driver "
+				"bug.",
+				(long long)sle64_to_cpu(ia->index_block_vcn),
+				(long long)vcn,
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto unm_unm_err_out;
 	}
-	offset = record + NTFS_GETU16(record + 0x18) + 0x18;
-	oldblock = walk->block;
-	walk->block = block;
-	retval = ntfs_getdir_iterate(walk, record, offset);
-	walk->block = oldblock;
-	ntfs_free(record);
-	return retval;
-}
-
-/* Go down to the next block of entries. These collate before the current
- * entry. */
-static int ntfs_descend(ntfs_iterate_s *walk, ntfs_u8 *start, ntfs_u8 *entry)
-{
-	int length = NTFS_GETU16(entry + 8);
-	int nextblock = NTFS_GETU32(entry + length - 8);
-	int error;
-
-	if (!ntfs_entry_has_subnodes(entry)) {
-		ntfs_error("illegal ntfs_descend call\n");
-		return 0;
+	if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
+			dir_ni->_IDM(index_block_size)) {
+		ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+				"0x%Lx has a size (%u) differing from the "
+				"directory specified size (%u). Directory "
+				"inode is corrupt or driver bug.",
+				(long long)vcn,
+				(unsigned long long)dir_ni->mft_no,
+				le32_to_cpu(ia->index.allocated_size) + 0x18,
+				dir_ni->_IDM(index_block_size));
+		err = -EIO;
+		goto unm_unm_err_out;
 	}
-	error = ntfs_getdir_record(walk, nextblock);
-	if (!error && walk->type == DIR_INSERT && 
-	    (walk->u.flags & ITERATE_SPLIT_DONE)) {
-		/* Split has occurred. Adjust entry, insert new_entry. */
-		NTFS_PUTU32(entry + length - 8, walk->newblock);
-		/* Reset flags, as the current block might be split again. */
-		walk->u.flags &= ~ITERATE_SPLIT_DONE;
-		error = ntfs_dir_insert(walk, start, entry);
+	index_end = (u8*)ia + dir_ni->_IDM(index_block_size);
+	if (index_end > kaddr + PAGE_CACHE_SIZE) {
+		ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+				"0x%Lx crosses page boundary. Impossible! "
+				"Cannot access! This is probably a bug in the "
+				"driver.", (long long)vcn,
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto unm_unm_err_out;
 	}
-	return error;
-}
-
-static int ntfs_getdir_iterate_byposition(ntfs_iterate_s *walk, char* start,
-					  char *entry)
-{
-	int retval = 0;
-	int curpos = 0, destpos = 0;
-	int length;
-	if (walk->u.pos != 0) {
-		if (ntfs_is_top(walk->u.pos))
-			return 0;
-		destpos = ntfs_pop(&walk->u.pos);
+	index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
+	if (index_end > (u8*)ia + dir_ni->_IDM(index_block_size)) {
+		ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+				"inode 0x%Lx exceeds maximum size.",
+				(long long)vcn,
+				(unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto unm_unm_err_out;
 	}
-	while (1) {
-		if (walk->u.pos == 0) {
-			if (ntfs_entry_has_subnodes(entry))
-				ntfs_descend(walk, start, entry);
-			else
-				walk->u.pos = ntfs_top();
-			if (ntfs_is_top(walk->u.pos) && 
-			    !ntfs_entry_is_used(entry))
-				return 1;
-			walk->u.pos = ntfs_push(walk->u.pos, curpos);
-			return 1;
-		}
-		if (curpos == destpos) {
-			if (!ntfs_is_top(walk->u.pos) && 
-			    ntfs_entry_has_subnodes(entry)) {
-				retval = ntfs_descend(walk, start, entry);
-				if (retval) {
-					walk->u.pos = ntfs_push(walk->u.pos,
-								curpos);
-					return retval;
-				}
-				if (!ntfs_entry_is_used(entry))
-					return 0;
-				walk->u.pos = 0;
-			}
-			if (ntfs_entry_is_used(entry)) {
-				retval = ntfs_copyresult(walk->result, entry);
-				walk->u.pos = 0;
-			} else {
-				walk->u.pos = ntfs_top();
-				return 0;
-			}
+	/* The first index entry. */
+	ie = (INDEX_ENTRY*)((u8*)&ia->index +
+			le32_to_cpu(ia->index.entries_offset));
+	/*
+	 * Iterate similar to above big loop but applied to index buffer, thus
+	 * loop until we exceed valid memory (corruption case) or until we
+	 * reach the last entry.
+	 */
+	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
+		/* Bounds check. */
+		if ((u8*)ie < (u8*)ia || (u8*)ie +
+				sizeof(INDEX_ENTRY_HEADER) > index_end ||
+				(u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
+				index_end) {
+			ntfs_error(sb, "Index entry out of bounds in "
+					"directory inode 0x%Lx.",
+					(unsigned long long)dir_ni->mft_no);
+			err = -EIO;
+			goto unm_unm_err_out;
 		}
-		curpos++;
-		if (!ntfs_entry_is_used(entry))
-			break;
-		length = NTFS_GETU16(entry + 8);
-		if (!length) {
-			ntfs_error("infinite loop\n");
+		/*
+		 * The last entry cannot contain a name. It can however contain
+		 * a pointer to a child node in the B+tree so we just break out.
+		 */
+		if (ie->_IEH(flags) & INDEX_ENTRY_END)
 			break;
+		/*
+		 * If the current entry has a name type of POSIX, the name is
+		 * case sensitive and not otherwise. This has the effect of us
+		 * not being able to access any POSIX file names which collate
+		 * after the non-POSIX one when they only differ in case, but
+		 * anyone doing screwy stuff like that deserves to burn in
+		 * hell... Doing that kind of stuff on NT4 actually causes
+		 * corruption on the partition even when using SP6a and Linux
+		 * is not involved at all.
+		 */
+		ic = ie->key.file_name.file_name_type ? IGNORE_CASE :
+				CASE_SENSITIVE;
+		/*
+		 * If the names match perfectly, we are done and return the
+		 * mft reference of the inode (i.e. the inode number together
+		 * with the sequence number for consistency checking. We
+		 * convert it to cpu format before returning.
+		 */
+		if (ntfs_are_names_equal(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, ic,
+				vol->upcase, vol->upcase_len)) {
+found_it2:
+			mref = le64_to_cpu(ie->_IIF(indexed_file));
+			ntfs_unmap_page(page);
+			put_attr_search_ctx(ctx);
+			unmap_mft_record(READ, dir_ni);
+			return mref;
 		}
-		entry += length;
-	}
-	return -1;
-}
-	
-/* Iterate over a list of entries, either from an index block, or from the
- * index root.
- * If searching BY_POSITION, pop the top index from the position. If the
- * position stack is empty then, return the item at the index and set the
- * position to the next entry. If the position stack is not empty, 
- * recursively proceed for subnodes. If the entry at the position is the
- * 'end of dir' entry, return 'not found' and the empty stack.
- * If searching BY_NAME, walk through the items until found or until
- * one item is collated after the requested item. In the former case, return
- * the result. In the latter case, recursively proceed to the subnodes.
- * If 'end of dir' is reached, the name is not in the directory */
-static int ntfs_getdir_iterate(ntfs_iterate_s *walk, char *start, char *entry)
-{
-	int length;
-	int cmp;
-
-	if (walk->type == BY_POSITION)
-		return ntfs_getdir_iterate_byposition(walk, start, entry);
-	do {
-		/* If the current entry is a real one, compare with the
-		 * requested item. If the current entry is the last item, it
-		 * is always larger than the requested item. */
-		cmp = ntfs_entry_is_used(entry) ? 
-						ntfs_my_strcmp(walk,entry) : -1;
-		switch (walk->type) {
-		case BY_NAME:
-			switch (cmp) {
-			case -1:
-				return ntfs_entry_has_subnodes(entry) ?
-					ntfs_descend(walk, start, entry) : 0;
-			case  0:
-				return ntfs_copyresult(walk->result, entry);
-			case  1:
-				break;
-			}
+		/*
+		 * Not a perfect match, need to do full blown collation so we
+		 * know which way in the B+tree we have to go.
+		 */
+		rc = ntfs_collate_names(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, 1,
+				IGNORE_CASE, vol->upcase, vol->upcase_len);
+		/*
+		 * If uname collates before the name of the current entry, there
+		 * is definitely no such name in this index but we might need to
+		 * descend into the B+tree so we just break out of the loop.
+		 */
+		if (rc == -1)
 			break;
-		case DIR_INSERT:
-			switch (cmp) {
-			case -1:
-				return ntfs_entry_has_subnodes(entry) ?
-					ntfs_descend(walk, start, entry) :
-					ntfs_dir_insert(walk, start, entry);
-			case  0:
-				return -EEXIST;
-			case  1:
-				break;
-			}
+		/* The names are not equal, continue the search. */
+		if (rc)
+			continue;
+		/*
+		 * Names match with case insensitive comparison, now try the
+		 * case sensitive comparison, which is required for proper
+		 * collation.
+		 */
+		rc = ntfs_collate_names(uname, uname_len,
+				(uchar_t*)&ie->key.file_name.file_name,
+				ie->key.file_name.file_name_length, 1,
+				CASE_SENSITIVE, vol->upcase, vol->upcase_len);
+		if (rc == -1)
 			break;
-		default:
-			ntfs_error("TODO\n"); /* FIXME: ? */
+		if (rc)
+			continue;
+		/*
+		 * Perfect match, this will never happen as the
+		 * ntfs_are_names_equal() call will have gotten a match but we
+		 * still treat it correctly.
+		 */
+		goto found_it2;
+	}
+	/*
+	 * We have finished with this index buffer without success. Check for
+	 * the presence of a child node.
+	 */
+	if (ie->_IEH(flags) & INDEX_ENTRY_NODE) {
+		if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
+			ntfs_error(sb, "Index entry with child node found in "
+					"a leaf node in directory inode 0x%Lx.",
+					(unsigned long long)dir_ni->mft_no);
+			err = -EIO;
+			goto unm_unm_err_out;
+		}
+		/* Child node present, descend into it. */
+		old_vcn = vcn;
+		vcn = sle64_to_cpup((u8*)ie +
+				le16_to_cpu(ie->_IEH(length)) - 8);
+		if (vcn >= 0) {
+			/* If vcn is in the same page cache page as old_vcn we
+			 * recycle the mapped page. */
+			if (old_vcn << vol->cluster_size_bits >>
+					PAGE_CACHE_SHIFT == vcn <<
+					vol->cluster_size_bits >>
+					PAGE_CACHE_SHIFT)
+				goto fast_descend_into_child_node;
+			ntfs_unmap_page(page);
+			goto descend_into_child_node;
 		}
-		if (!ntfs_entry_is_used(entry))
-			break;
-		length = NTFS_GETU16(entry + 8);
-		if (!length) {
-			ntfs_error("infinite loop\n");
-			break;
+		ntfs_error(sb, "Negative child node vcn in directory inode "
+				"0x%Lx.", (unsigned long long)dir_ni->mft_no);
+		err = -EIO;
+		goto unm_unm_err_out;
+	}
+	/* No child node, return -ENOENT. */
+	ntfs_debug("Entry not found.");
+	err = -ENOENT;
+unm_unm_err_out:
+	ntfs_unmap_page(page);
+put_unm_err_out:
+	put_attr_search_ctx(ctx);
+unm_err_out:
+	unmap_mft_record(READ, dir_ni);
+	return ERR_MREF(err);
+map_err_out:
+	ntfs_error(sb, "map_mft_record(READ) failed with error code %ld.",
+			-PTR_ERR(m));
+	return ERR_MREF(PTR_ERR(m));
+dir_err_out:
+	ntfs_error(sb, "Corrupt directory. Aborting lookup.");
+	err = -EIO;
+	goto put_unm_err_out;
+}
+
+typedef union {
+	INDEX_ROOT *ir;
+	INDEX_ALLOCATION *ia;
+} index_union __attribute__ ((__transparent_union__));
+
+typedef enum {
+	INDEX_TYPE_ROOT,	/* index root */
+	INDEX_TYPE_ALLOCATION,	/* index allocation */
+} INDEX_TYPE;
+
+/**
+ * ntfs_filldir - ntfs specific filldir method
+ * @vol:	current ntfs volume
+ * @filp:	open file descriptor for the current directory
+ * @ndir:	ntfs inode of current directory
+ * @index_type:	specifies whether @iu is an index root or an index allocation
+ * @iu:		index root or index allocation attribute to which @ie belongs
+ * @ie:		current index entry
+ * @name:	buffer to use for the converted name
+ * @dirent:	vfs filldir callback context
+ * filldir:	vfs filldir callback
+ *
+ * Convert the Unicode name to the loaded NLS and pass it to
+ * the filldir callback.
+ */
+static inline int ntfs_filldir(ntfs_volume *vol, struct file *filp,
+		ntfs_inode *ndir, const INDEX_TYPE index_type,
+		index_union iu, INDEX_ENTRY *ie, u8 *name,
+		void *dirent, filldir_t filldir)
+{
+	int name_len;
+	unsigned dt_type;
+	FILE_NAME_TYPE_FLAGS name_type;
+	READDIR_OPTIONS readdir_opts;
+
+	/* Advance the position even if going to skip the entry. */
+	if (index_type == INDEX_TYPE_ALLOCATION)
+		filp->f_pos = (u8*)ie - (u8*)iu.ia +
+				(sle64_to_cpu(iu.ia->index_block_vcn) <<
+				ndir->_IDM(index_vcn_size_bits)) +
+				vol->mft_record_size;
+	else /* if (index_type == INDEX_TYPE_ROOT) */
+		filp->f_pos = (u8*)ie - (u8*)iu.ir;
+	readdir_opts = vol->readdir_opts;
+	name_type = ie->key.file_name.file_name_type;
+	if (name_type == FILE_NAME_DOS && RHideDosNames(readdir_opts)) {
+		ntfs_debug("Skipping DOS name space entry.");
+		return 0;
+	}
+	if (RHideLongNames(readdir_opts)) {
+		if (name_type == FILE_NAME_WIN32 ||
+				name_type == FILE_NAME_POSIX) {
+			ntfs_debug("Skipping WIN32/POSIX name space entry.");
+			return 0;
 		}
-		entry += length;
-	} while (1);
-	return 0;
-}
-
-/*  Tree walking is done using position numbers. The following numbers have a
- *  special meaning:
- *       0   start (.)
- *      -1   no more entries
- *      -2   ..
- *  All other numbers encode sequences of indices. The sequence a, b, c is 
- *  encoded as <stop><c><b><a>, where <foo> is the encoding of foo. The
- *  first few integers are encoded as follows:
- *      0:    0000    1:    0010    2:    0100    3:    0110
- *      4:    1000    5:    1010    6:    1100 stop:    1110
- *      7:  000001    8:  000101    9:  001001   10:  001101
- *  The least significant bits give the width of this encoding, the other bits
- *  encode the value, starting from the first value of the interval.
- *   tag     width  first value  last value
- *   0       3      0            6
- *   01      4      7            22
- *   011     5      23           54
- *   0111    6      55           119
- *   More values are hopefully not needed, as the file position has currently
- *   64 bits in total. */
-
-/* Find an entry in the directory. Return 0 if not found, otherwise copy the
- * entry to the result buffer. */
-int ntfs_getdir(ntfs_iterate_s *walk)
-{
-	int length = walk->dir->vol->mft_record_size;
-	int retval, error;
-	/* Start at the index root. */
-	char *root = ntfs_malloc(length);
-	ntfs_io io;
-
-	if (!root)
-		return -ENOMEM;
-	io.fn_put = ntfs_put;
-	io.param = root;
-	io.size = length;
-	error = ntfs_read_attr(walk->dir, walk->dir->vol->at_index_root, I30,
-			       0, &io);
-	if (error) {
-		ntfs_error("Not a directory\n");
+	}
+	if (MREF_LE(ie->_IIF(indexed_file)) == FILE_root) {
+		ntfs_debug("Skipping root directory self reference entry.");
 		return 0;
 	}
-	walk->block = -1;
-	/* FIXME: Move these to walk. */
-	walk->dir->u.index.recordsize = NTFS_GETU32(root + 0x8);
-	walk->dir->u.index.clusters_per_record = NTFS_GETU32(root + 0xC);
-	/* FIXME: Consistency check. */
-	/* Skip header. */
-	retval = ntfs_getdir_iterate(walk, root, root + 0x20);
-	ntfs_free(root);
-	return retval;
-}
-
-/* Find an entry in the directory by its position stack. Iteration starts
- * if the stack is 0, in which case the position is set to the first item
- * in the directory. If the position is nonzero, return the item at the
- * position and change the position to the next item. The position is -1
- * if there are no more items. */
-int ntfs_getdir_byposition(ntfs_iterate_s *walk)
-{
-	walk->type = BY_POSITION;
-	return ntfs_getdir(walk);
-}
-
-/* Find an entry in the directory by its name. Return 0 if not found. */
-int ntfs_getdir_byname(ntfs_iterate_s *walk)
-{
-	walk->type = BY_NAME;
-	return ntfs_getdir(walk);
+	if (MREF_LE(ie->_IIF(indexed_file)) < FILE_first_user &&
+			RHideSystemFiles(readdir_opts)) {
+		ntfs_debug("Skipping system file.");
+		return 0;
+	}
+	name_len = ntfs_ucstonls(vol, (uchar_t*)&ie->key.file_name.file_name,
+			ie->key.file_name.file_name_length, &name,
+			NTFS_MAX_NAME_LEN * 3 + 1);
+	if (name_len <= 0) {
+		ntfs_debug("Skipping unrepresentable file.");
+		return 0;
+	}
+	if (ie->key.file_name.file_attributes &
+			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
+		dt_type = DT_DIR;
+	else
+		dt_type = DT_REG;
+	ntfs_debug("Calling filldir for %s with len %i, f_pos 0x%Lx, inode "
+			"0x%Lx, DT_%s.", name, name_len, filp->f_pos,
+			(unsigned long long)MREF_LE(ie->_IIF(indexed_file)),
+			dt_type == DT_DIR ? "DIR" : "REG");
+	return filldir(dirent, name, name_len, filp->f_pos,
+			(unsigned long)MREF_LE(ie->_IIF(indexed_file)), dt_type);
 }
 
-int ntfs_getdir_unsorted(ntfs_inode *ino, u32 *p_high, u32 *p_low,
-		int (*cb)(ntfs_u8 *, void *), void *param)
+/*
+ * VFS calls readdir with BKL held so no possible RACE conditions.
+ * We use the same basic approach as the old NTFS driver, i.e. we parse the
+ * index root entries and then the index allocation entries that are marked
+ * as in use in the index bitmap.
+ * While this will return the names in random order this doesn't matter for
+ * readdir but OTOH results in faster readdir.
+ */
+static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-	s64 ib_ofs;
-	char *buf = 0, *entry = 0;
-	ntfs_attribute *attr;
-	ntfs_volume *vol;
-	int byte, bit, err = 0;
-	u32 start, finish, ibs, max_size;
-	ntfs_io io;
-	u8 ibs_bits;
-
-	if (!ino) {
-		ntfs_error(__FUNCTION__ "(): No inode! Returning -EINVAL.\n");
-		return -EINVAL;
-	}
-	vol = ino->vol;
-	if (!vol) {
-		ntfs_error(__FUNCTION__ "(): Inode 0x%lx has no volume. "
-				"Returning -EINVAL.\n", ino->i_number);
-		return -EINVAL;
-	}
-	ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 1: Entering for "
-			"inode 0x%lx, p_high = 0x%x, p_low = 0x%x.\n",
-			ino->i_number, *p_high, *p_low);
-	if (!*p_high) {
-		/* We are still in the index root. */
-		buf = ntfs_malloc(io.size = vol->mft_record_size);
-		if (!buf)
-			return -ENOMEM;
-		io.fn_put = ntfs_put;
-		io.param = buf;
-		err = ntfs_read_attr(ino, vol->at_index_root, I30, 0, &io);
-		if (err || !io.size)
-			goto read_err_ret;
-		ino->u.index.recordsize = ibs = NTFS_GETU32(buf + 0x8);
-		ino->u.index.clusters_per_record = NTFS_GETU32(buf + 0xC);
-		entry = buf + 0x20;
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 2: In index "
-				"root.\n");
-		ibs_bits = ffs(ibs) - 1;
-		/* Compensate for faked "." and "..". */
-		start = 2;
-	} else { /* We are in an index record. */
-		io.size = ibs = ino->u.index.recordsize;
-		buf = ntfs_malloc(ibs);
-		if (!buf)
-			return -ENOMEM;
-		ibs_bits = ffs(ibs) - 1;
-		io.fn_put = ntfs_put;
-		io.param = buf;
+	s64 ia_pos, ia_start, prev_ia_pos;
+	struct inode *vdir = filp->f_dentry->d_inode;
+	struct super_block *sb = vdir->i_sb;
+	ntfs_inode *ndir = NTFS_I(vdir);
+	ntfs_volume *vol = NTFS_SB(sb);
+	MFT_RECORD *m;
+	INDEX_ROOT *ir;
+	INDEX_ENTRY *ie;
+	INDEX_ALLOCATION *ia;
+	u8 *name;
+	int rc, err, ir_pos, bmp_pos;
+	struct address_space *ia_mapping;
+	struct page *page;
+	u8 *kaddr, *bmp, *index_end;
+	attr_search_context *ctx;
+
+	ntfs_debug("Entering for inode 0x%Lx, f_pos 0x%Lx.",
+			(unsigned long long)ndir->mft_no, filp->f_pos);
+	rc = err = 0;
+	/* Are we at end of dir yet? */
+	if (filp->f_pos >= vdir->i_size + vol->mft_record_size)
+		goto done;
+	/* Emulate . and .. for all directories. */
+	if (!filp->f_pos) {
+		ntfs_debug("Calling filldir for . with len 1, f_pos 0x0, "
+				"inode 0x%Lx, DT_DIR.",
+				(unsigned long long)ndir->mft_no);
+		rc = filldir(dirent, ".", 1, filp->f_pos, vdir->i_ino, DT_DIR);
+		if (rc)
+			goto done;
+		filp->f_pos++;
+	}
+	if (filp->f_pos == 1) {
+		ntfs_debug("Calling filldir for .. with len 2, f_pos 0x1, "
+				"inode 0x%lx, DT_DIR.",
+				filp->f_dentry->d_parent->d_inode->i_ino);
+		rc = filldir(dirent, "..", 2, filp->f_pos,
+				filp->f_dentry->d_parent->d_inode->i_ino, DT_DIR);
+		if (rc)
+			goto done;
+		filp->f_pos++;
+	}
+	/* Get hold of the mft record for the directory. */
+	m = map_mft_record(READ, ndir);
+	if (IS_ERR(m)) {
+		err = PTR_ERR(m);
+		goto err_out;
+	}
+
+	ctx = get_attr_search_ctx(ndir, m);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto unm_err_out;
+	}
+
+	/*
+	 * Allocate a buffer to store the current name being processed
+	 * converted to format determined by current NLS.
+	 */
+	name = (u8*)kmalloc(NTFS_MAX_NAME_LEN * 3 + 1, GFP_NOFS);
+	if (!name) {
+		err = -ENOMEM;
+		goto put_unm_err_out;
+	}
+	/* Are we jumping straight into the index allocation attribute? */
+	if (filp->f_pos >= vol->mft_record_size)
+		goto skip_index_root;
+	/* Get the offset into the index root attribute. */
+	ir_pos = (s64)filp->f_pos;
+	/* Find the index root attribute in the mft record. */
+	if (!lookup_attr(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL, 0,
+			ctx)) {
+		ntfs_error(sb, "Index root attribute missing in directory "
+				"inode 0x%Lx.",
+				(unsigned long long)ndir->mft_no);
+		err = -EIO;
+		goto kf_unm_err_out;
+	}
+	/* Get to the index root value (it's been verified in read_inode). */
+	ir = (INDEX_ROOT*)((u8*)ctx->attr +
+			le16_to_cpu(ctx->attr->_ARA(value_offset)));
+	index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
+	/* The first index entry. */
+	ie = (INDEX_ENTRY*)((u8*)&ir->index +
+			le32_to_cpu(ir->index.entries_offset));
+	/*
+	 * Loop until we exceed valid memory (corruption case) or until we
+	 * reach the last entry or until filldir tells us it has had enough
+	 * or signals an error (both covered by the rc test).
+	 */
+	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
+		ntfs_debug("In index root, offset 0x%x.", (u8*)ie - (u8*)ir);
+		/* Bounds checks. */
+		if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
+				sizeof(INDEX_ENTRY_HEADER) > index_end ||
+				(u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
+				index_end)
+			goto dir_err_out;
+		/* The last entry cannot contain a name. */
+		if (ie->_IEH(flags) & INDEX_ENTRY_END)
+			break;
+		/* Skip index root entry if continuing previous readdir. */
+		if (ir_pos > (u8*)ie - (u8*)ir)
+			continue;
+		/* Submit the name to the filldir callback. */
+		rc = ntfs_filldir(vol, filp, ndir, INDEX_TYPE_ROOT, ir, ie,
+				name, dirent, filldir);
+		if (rc)
+			goto abort;
+	}
+	/* If there is no index allocation attribute we are finished. */
+	if (!NInoIndexAllocPresent(ndir))
+		goto EOD;
+	/* Advance f_pos to the beginning of the index allocation. */
+	filp->f_pos = vol->mft_record_size;
+	/* Reinitialize the search context. */
+	reinit_attr_search_ctx(ctx);
+skip_index_root:
+	if (NInoBmpNonResident(ndir)) {
 		/*
-		 * 0 is index root, index allocation starts at 1 and works in
-		 * units of index block size (ibs).
+		 * Read the page of the bitmap that contains the current index
+		 * block.
 		 */
-		ib_ofs = (s64)(*p_high - 1) << ibs_bits;
-		err = ntfs_read_attr(ino, vol->at_index_allocation, I30, ib_ofs,
-				&io);
-		if (err || io.size != ibs)
-			goto read_err_ret;
-		if (!ntfs_check_index_record(ino, buf)) {
-			ntfs_error(__FUNCTION__ "(): Index block 0x%x is not "
-					"an index record. Returning "
-					"-ENOTDIR.\n", *p_high - 1);
-			ntfs_free(buf);
-			return -ENOTDIR;
-		}
-		entry = buf + 0x18 + NTFS_GETU16(buf + 0x18);
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 3: In index "
-				"allocation.\n");
-		start = 0;
-	}
-	/* Process the entries. */
-	finish = *p_low;
-	for (; entry < (buf + ibs) && ntfs_entry_is_used(entry);
-			entry += NTFS_GETU16(entry + 8)) {
-		if (start < finish) {
-			/* Skip entries that were already processed. */
-			ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 4: "
-					"Skipping already processed entry "
-					"p_high 0x%x, p_low 0x%x.\n", *p_high,
-					start);
-			start++;
-			continue;
-		}
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 5: "
-				"Processing entry p_high 0x%x, p_low 0x%x.\n",
-				*p_high, *p_low);
-		if ((err = cb(entry, param))) {
-			/* filldir signalled us to stop. */
-			ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): "
-					"Unsorted 6: cb returned %i, "
-					"returning 0, p_high 0x%x, p_low 0x%x."
-					"\n", *p_high, *p_low);
-			ntfs_free(buf);
-			return 0;
-		}
-		++*p_low;
+		// TODO: FIXME: Implement this!
+		ntfs_error(sb, "Index bitmap is non-resident, which is not "
+				"supported yet. Pretending that end of "
+				"directory has been reached.\n");
+		goto EOD;
+	} else {
+		/* Find the index bitmap attribute in the mft record. */
+		if (!lookup_attr(AT_BITMAP, I30, 4, CASE_SENSITIVE, 0, NULL, 0,
+				ctx)) {
+			ntfs_error(sb, "Index bitmap attribute missing in "
+					"directory inode 0x%Lx.",
+					(unsigned long long)ndir->mft_no);
+			err = -EIO;
+			goto kf_unm_err_out;
+		}
+		bmp = (u8*)ctx->attr +
+				le16_to_cpu(ctx->attr->_ARA(value_offset));
+	}
+	/* Get the offset into the index allocation attribute. */
+	ia_pos = (s64)filp->f_pos - vol->mft_record_size;
+	ia_mapping = vdir->i_mapping;
+	/* If the index block is not in use find the next one that is. */
+	bmp_pos = ia_pos >> ndir->_IDM(index_block_size_bits);
+	page = NULL;
+	kaddr = NULL;
+	prev_ia_pos = -1LL;
+	if (bmp_pos >> 3 >= ndir->_IDM(bmp_size)) {
+		ntfs_error(sb, "Current index allocation position exceeds "
+				"index bitmap size.");
+		goto kf_unm_err_out;
+	}
+	while (!(bmp[bmp_pos >> 3] & (1 << (bmp_pos & 7)))) {
+find_next_index_buffer:
+		bmp_pos++;
+		/* If we have reached the end of the bitmap, we are done. */
+		if (bmp_pos >> 3 >= ndir->_IDM(bmp_size))
+			goto EOD;
+		ia_pos = (s64)bmp_pos << ndir->_IDM(index_block_size_bits);
+	}
+	ntfs_debug("Handling index buffer 0x%x.", bmp_pos);
+	/* If the current index buffer is in the same page we reuse the page. */
+	if ((prev_ia_pos & PAGE_CACHE_MASK) != (ia_pos & PAGE_CACHE_MASK)) {
+		prev_ia_pos = ia_pos;
+		if (page)
+			ntfs_unmap_page(page);
+		/*
+		 * Map the page cache page containing the current ia_pos,
+		 * reading it from disk if necessary.
+		 */
+		page = ntfs_map_page(ia_mapping, ia_pos >> PAGE_CACHE_SHIFT);
+		if (IS_ERR(page))
+			goto map_page_err_out;
+		kaddr = (u8*)page_address(page);
+	}
+	/* Get the current index buffer. */
+	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
+			~(s64)(ndir->_IDM(index_block_size) - 1)));
+	/* Bounds checks. */
+	if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
+		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
+				"inode 0x%Lx or driver bug.",
+				(unsigned long long)ndir->mft_no);
+		err = -EIO;
+		goto unm_dir_err_out;
 	}
-	ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 7: After processing "
-			"entries, p_high 0x%x, p_low 0x%x.\n", *p_high, *p_low);
-	/* We have to locate the next record. */
-	ntfs_free(buf);
-	buf = 0;
-	*p_low = 0;
-	attr = ntfs_find_attr(ino, vol->at_bitmap, I30);
-	if (!attr) {
-		/* Directory does not have index bitmap and index allocation. */
-		*p_high = 0x7fff;
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 8: No index "
-				"allocation. Returning 0, p_high 0x7fff, "
-				"p_low 0x0.\n");
-		return 0;
+	if (sle64_to_cpu(ia->index_block_vcn) != (ia_pos &
+			~(s64)(ndir->_IDM(index_block_size) - 1)) >>
+			ndir->_IDM(index_vcn_size_bits)) {
+		ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+				"different from expected VCN (0x%Lx). "
+				"Directory inode 0x%Lx is corrupt or driver "
+				"bug. ",
+				(long long)sle64_to_cpu(ia->index_block_vcn),
+				(long long)ia_pos >>
+				ndir->_IDM(index_vcn_size_bits),
+				(unsigned long long)ndir->mft_no);
+		err = -EIO;
+		goto unm_dir_err_out;
 	}
-	max_size = attr->size;
-	if (max_size > 0x7fff >> 3) {
-		ntfs_error(__FUNCTION__ "(): Directory too large. Visible "
-				"length is truncated.\n");
-		max_size = 0x7fff >> 3;
-	}
-	buf = ntfs_malloc(max_size);
-	if (!buf)
-		return -ENOMEM;
-	io.param = buf;
-	io.size = max_size;
-	err = ntfs_read_attr(ino, vol->at_bitmap, I30, 0, &io);
-	if (err || io.size != max_size)
-		goto read_err_ret;
-	attr = ntfs_find_attr(ino, vol->at_index_allocation, I30);
-	if (!attr) {
-		ntfs_free(buf);
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 9: Find "
-				"attr failed. Returning -EIO.\n");
-		return -EIO;
-	}
-	if (attr->resident) {
-		ntfs_free(buf);
-		ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 9.5: IA is "
-				"resident. Not allowed. Returning EINVAL.\n");
-		return -EINVAL;
-	}
-	/* Loop while going through non-allocated index records. */
-	max_size <<= 3;
-	while (1) {
-		if (++*p_high >= 0x7fff) {
-			ntfs_error(__FUNCTION__ "(): Unsorted 10: Directory "
-					"inode 0x%lx overflowed the maximum "
-					"number of index allocation buffers "
-					"the driver can cope with. Pretending "
-					"to be at end of directory.\n",
-					ino->i_number);
-			goto fake_eod;
-		}
-		if (*p_high > max_size || (s64)*p_high << ibs_bits >
-				attr->initialized) {
-fake_eod:
-			/* No more index records. */
-			*p_high = 0x7fff;
-			*p_low = 0;
-			ntfs_free(buf);
-			ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted "
-					"10.5: No more index records. "
-					"Returning 0, p_high 0x7fff, p_low "
-					"0.\n");
-			return 0;
-		}
-		byte = (ntfs_cluster_t)(*p_high - 1);
-		bit = 1 << (byte & 7);
-		byte >>= 3;
-		if ((buf[byte] & bit))
+	if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
+			ndir->_IDM(index_block_size)) {
+		ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+				"0x%Lx has a size (%u) differing from the "
+				"directory specified size (%u). Directory "
+				"inode is corrupt or driver bug.",
+				(long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
+				(unsigned long long)ndir->mft_no,
+				le32_to_cpu(ia->index.allocated_size) + 0x18,
+				ndir->_IDM(index_block_size));
+		err = -EIO;
+		goto unm_dir_err_out;
+	}
+	index_end = (u8*)ia + ndir->_IDM(index_block_size);
+	if (index_end > kaddr + PAGE_CACHE_SIZE) {
+		ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+				"0x%Lx crosses page boundary. Impossible! "
+				"Cannot access! This is probably a bug in the "
+				"driver.", (long long)ia_pos >>
+				ndir->_IDM(index_vcn_size_bits),
+				(unsigned long long)ndir->mft_no);
+		err = -EIO;
+		goto unm_dir_err_out;
+	}
+	ia_start = ia_pos & ~(s64)(ndir->_IDM(index_block_size) - 1);
+	index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
+	if (index_end > (u8*)ia + ndir->_IDM(index_block_size)) {
+		ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+				"inode 0x%Lx exceeds maximum size.",
+				(long long)ia_pos >>
+				ndir->_IDM(index_vcn_size_bits),
+				(unsigned long long)ndir->mft_no);
+		err = -EIO;
+		goto unm_dir_err_out;
+	}
+	/* The first index entry in this index buffer. */
+	ie = (INDEX_ENTRY*)((u8*)&ia->index +
+			le32_to_cpu(ia->index.entries_offset));
+	/*
+	 * Loop until we exceed valid memory (corruption case) or until we
+	 * reach the last entry or until filldir tells us it has had enough
+	 * or signals an error (both covered by the rc test).
+	 */
+	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
+		ntfs_debug("In index allocation, offset 0x%Lx.",
+				(long long)ia_start + ((u8*)ie - (u8*)ia));
+		/* Bounds checks. */
+		if ((u8*)ie < (u8*)ia || (u8*)ie +
+				sizeof(INDEX_ENTRY_HEADER) > index_end ||
+				(u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
+				index_end)
+			goto unm_dir_err_out;
+		/* The last entry cannot contain a name. */
+		if (ie->_IEH(flags) & INDEX_ENTRY_END)
 			break;
-	};
-	ntfs_debug(DEBUG_DIR3, __FUNCTION__ "(): Unsorted 11: Done. "
-			"Returning 0, p_high 0x%x, p_low 0x%x.\n", *p_high,
-			*p_low);
-	ntfs_free(buf);
+		/* Skip index block entry if continuing previous readdir. */
+		if (ia_pos - ia_start > (u8*)ie - (u8*)ia)
+			continue;
+		/* Submit the name to the filldir callback. */
+		rc = ntfs_filldir(vol, filp, ndir, INDEX_TYPE_ALLOCATION, ia,
+				ie, name, dirent, filldir);
+		if (rc) {
+			ntfs_unmap_page(page);
+			goto abort;
+		}
+	}
+	goto find_next_index_buffer;
+EOD:
+	/* We are finished, set f_pos to EOD. */
+	filp->f_pos = vdir->i_size + vol->mft_record_size;
+abort:
+	put_attr_search_ctx(ctx);
+	unmap_mft_record(READ, ndir);
+	kfree(name);
+done:
+#ifdef DEBUG
+	if (!rc)
+		ntfs_debug("EOD, f_pos 0x%Lx, returning 0.", filp->f_pos);
+	else
+		ntfs_debug("filldir returned %i, f_pos 0x%Lx, returning 0.",
+				rc, filp->f_pos);
+#endif
 	return 0;
-read_err_ret:
-	if (!err)
-		err = -EIO;
-	ntfs_error(__FUNCTION__ "(): Read failed. Returning error code %i.\n",
-			err);
-	ntfs_free(buf);
+map_page_err_out:
+	ntfs_error(sb, "Reading index allocation data failed.");
+	err = PTR_ERR(page);
+kf_unm_err_out:
+	kfree(name);
+put_unm_err_out:
+	put_attr_search_ctx(ctx);
+unm_err_out:
+	unmap_mft_record(READ, ndir);
+err_out:
+	ntfs_debug("Failed. Returning error code %i.", -err);
 	return err;
+unm_dir_err_out:
+	ntfs_unmap_page(page);
+dir_err_out:
+	ntfs_error(sb, "Corrupt directory. Aborting. You should run chkdsk.");
+	err = -EIO;
+	goto kf_unm_err_out;
 }
 
-int ntfs_dir_add(ntfs_inode *dir, ntfs_inode *new, ntfs_attribute *name)
-{
-	ntfs_iterate_s walk;
-	int nsize, esize;
-	ntfs_u8* entry, *ndata;
-	int error;
-
-	walk.type = DIR_INSERT;
-	walk.dir = dir;
-	walk.u.flags = 0;
-	nsize = name->size;
-	ndata = name->d.data;
-	walk.name = (ntfs_u16*)(ndata + 0x42);
-	walk.namelen = NTFS_GETU8(ndata + 0x40);
-	walk.new_entry_size = esize = (nsize + 0x10 + 7) & ~7;
-	walk.new_entry = entry = ntfs_malloc(esize);
-	if (!entry)
-		return -ENOMEM;
-	NTFS_PUTINUM(entry, new);
-	NTFS_PUTU16(entry + 0x8, esize); /* Size of entry. */
-	NTFS_PUTU16(entry + 0xA, nsize); /* Size of original name attribute. */
-	NTFS_PUTU16(entry + 0xC, 0);     /* Flags. */
-	NTFS_PUTU16(entry + 0xE, 0);	 /* Reserved. */
-	ntfs_memcpy(entry + 0x10, ndata, nsize);
-	ntfs_bzero(entry + 0x10 + nsize, esize - 0x10 - nsize);
-	error = ntfs_getdir(&walk);
-	if (walk.new_entry)
-		ntfs_free(walk.new_entry);
-	return error;
-}
-
-#if 0
-int ntfs_dir_add1(ntfs_inode *dir, const char* name, int namelen,
-		  ntfs_inode *ino)
-{
-	ntfs_iterate_s walk;
-	int error;
-	int nsize;
-	char *entry;
-	ntfs_attribute *name_attr;
-	error = ntfs_decodeuni(dir->vol, name, namelen, &walk.name,
-			       &walk.namelen);
-	if (error)
-		return error;
-	/* FIXME: Set flags. */
-	walk.type = DIR_INSERT;
-	walk.dir = dir;
-	/* walk.new = ino; */
-	/* Prepare new entry. */
-	/* Round up to a multiple of 8. */
-	walk.new_entry_size = nsize = ((0x52 + 2 * walk.namelen + 7) / 8) * 8;
-	walk.new_entry = entry = ntfs_malloc(nsize);
-	if (!entry)
-		return -ENOMEM;
-	ntfs_bzero(entry, nsize);
-	NTFS_PUTINUM(entry, ino);
-	NTFS_PUTU16(entry + 8, nsize);
-	NTFS_PUTU16(entry + 0xA, 0x42 + 2 * namelen); /* FIXME: Size of name 
-						       * attribute. */
-	NTFS_PUTU32(entry + 0xC, 0); /* FIXME: D-F? */
-	name_attr = ntfs_find_attr(ino, vol->at_file_name, 0);
-						    /* FIXME: multiple names */
-	if (!name_attr || !name_attr->resident)
-		return -EIDRM;
-	/* Directory, file stamps, sizes, filename. */
-	ntfs_memcpy(entry + 0x10, name_attr->d.data, 0x42 + 2 * namelen);
-	error = ntfs_getdir(&walk);
-	ntfs_free(walk.name);
-	return error;
-}
-#endif
-
-/* Fills out and creates an INDEX_ROOT attribute. */
-int ntfs_add_index_root(ntfs_inode *ino, int type)
-{
-	ntfs_attribute *da;
-	ntfs_u8 data[0x30]; /* 0x20 header, 0x10 last entry. */
-	char name[10];
-
-	NTFS_PUTU32(data, type);
-	/* Collation rule. 1 == COLLATION_FILENAME */
-	NTFS_PUTU32(data + 4, 1);
-	NTFS_PUTU32(data + 8, ino->vol->index_record_size);
-	NTFS_PUTU32(data + 0xC, ino->vol->index_clusters_per_record);
-	/* Byte offset to first INDEX_ENTRY. */
-	NTFS_PUTU32(data + 0x10, 0x10);
-	/* Size of entries, including header. */
-	NTFS_PUTU32(data + 0x14, 0x20);
-	NTFS_PUTU32(data + 0x18, 0x20);
-	/* No index allocation, yet. */
-	NTFS_PUTU32(data + 0x1C, 0);
-	/* Add last entry. */
-	/* Indexed MFT record. */
-	NTFS_PUTU64(data + 0x20, 0);
-	/* Size of entry. */
-	NTFS_PUTU32(data + 0x28, 0x10);
-	/* Flags: Last entry, no child nodes. */
-	NTFS_PUTU32(data + 0x2C, 2);
-	/* Compute name. */
-	ntfs_indexname(name, type);
-	return ntfs_create_attr(ino, ino->vol->at_index_root, name,
-				data, sizeof(data), &da);
-}
-
-int ntfs_mkdir(ntfs_inode *dir, const char *name, int namelen,
-	       ntfs_inode *result)
-{
-	int error;
-	
-	error = ntfs_alloc_inode(dir, result, name, namelen, NTFS_AFLAG_DIR);
-	if (error)
-		goto out;
-	error = ntfs_add_index_root(result, 0x30);
-	if (error)
-		goto out;
-	/* Set directory bit. */
-	result->attr[0x16] |= 2;
-	error = ntfs_update_inode(dir);
-	if (error)
-		goto out;
-	error = ntfs_update_inode(result);
-	if (error)
-		goto out;
- out:
-	return error;
-}
+struct file_operations ntfs_dir_ops = {
+	read:			generic_read_dir,	/* Return -EISDIR. */
+	readdir:		ntfs_readdir,		/* Read directory. */
+};
 
diff -Nur linux/fs/ntfs/dir.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/dir.h
--- linux/fs/ntfs/dir.h	Tue Jul 17 00:14:10 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/dir.h	Thu Jan  1 01:00:00 1970
@@ -1,48 +0,0 @@
-/*
- * dir.h - Header file for dir.c
- *
- * Copyright (C) 1997 Régis Duchesne
- */
-#define ITERATE_SPLIT_DONE      1
-
-enum ntfs_iterate_e {
-    BY_POSITION,
-    BY_NAME,
-    DIR_INSERT
-};
-
-/* not all fields are used for all operations */
-typedef struct ntfs_iterate_s {
-	enum ntfs_iterate_e type;
-	ntfs_inode *dir;
-	union{
-		ntfs_u64 pos;
-		int flags;
-	}u;
-	char *result;      /* pointer to entry if found */
-	ntfs_u16* name;
-	int namelen;
-	int block;         /* current index record */
-	int newblock;      /* index record created in a split */
-	char *new_entry;
-	int new_entry_size;
-	/*ntfs_inode* new;*/
-} ntfs_iterate_s;
-
-int ntfs_getdir_unsorted(ntfs_inode *ino, ntfs_u32 *p_high, ntfs_u32* p_low,
-			 int (*cb)(ntfs_u8*, void*), void *param);
-
-int ntfs_getdir_byname(ntfs_iterate_s *walk);
-
-int ntfs_dir_add(ntfs_inode *dir, ntfs_inode *new, ntfs_attribute *name);
-
-int ntfs_check_index_record(ntfs_inode *ino, char *record);
-
-int ntfs_getdir_byposition(ntfs_iterate_s *walk);
-
-int ntfs_mkdir(ntfs_inode* dir,const char* name,int namelen, ntfs_inode *ino);
-
-int ntfs_split_indexroot(ntfs_inode *ino);
-
-int ntfs_add_index_root(ntfs_inode *ino, int type);
-
diff -Nur linux/fs/ntfs/endian.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/endian.h
--- linux/fs/ntfs/endian.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/endian.h	Mon May  6 23:16:24 2002
@@ -0,0 +1,48 @@
+/*
+ * endian.h - Defines for endianness handling in NTFS Linux kernel driver.
+ *	      Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001 Anton Altaparmakov.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LINUX_NTFS_ENDIAN_H
+#define _LINUX_NTFS_ENDIAN_H
+
+#include <asm/byteorder.h>
+
+/*
+ * Signed endianness conversion defines.
+ */
+#define sle16_to_cpu(x)		((s16)__le16_to_cpu((s16)(x)))
+#define sle32_to_cpu(x)		((s32)__le32_to_cpu((s32)(x)))
+#define sle64_to_cpu(x)		((s64)__le64_to_cpu((s64)(x)))
+
+#define sle16_to_cpup(x)	((s16)__le16_to_cpu(*(s16*)(x)))
+#define sle32_to_cpup(x)	((s32)__le32_to_cpu(*(s32*)(x)))
+#define sle64_to_cpup(x)	((s64)__le64_to_cpu(*(s64*)(x)))
+
+#define cpu_to_sle16(x)		((s16)__cpu_to_le16((s16)(x)))
+#define cpu_to_sle32(x)		((s32)__cpu_to_le32((s32)(x)))
+#define cpu_to_sle64(x)		((s64)__cpu_to_le64((s64)(x)))
+
+#define cpu_to_sle16p(x)	((s16)__cpu_to_le16(*(s16*)(x)))
+#define cpu_to_sle32p(x)	((s32)__cpu_to_le32(*(s32*)(x)))
+#define cpu_to_sle64p(x)	((s64)__cpu_to_le64(*(s64*)(x)))
+
+#endif /* _LINUX_NTFS_ENDIAN_H */
+
diff -Nur linux/fs/ntfs/file.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/file.c
--- linux/fs/ntfs/file.c	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/file.c	Mon May  6 23:16:24 2002
@@ -0,0 +1,150 @@
+/*
+ * file.c - NTFS kernel file operations. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001 Anton Altaparmakov.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ntfs.h"
+
+struct file_operations ntfs_file_ops = {
+	llseek:			generic_file_llseek,	/* Seek inside file. */
+	read:			generic_file_read,	/* Read from file. */
+	write:			NULL,			/* . */
+	readdir:		NULL,			/* . */
+	poll:			NULL,			/* . */
+	ioctl:			NULL,			/* . */
+	mmap:			generic_file_mmap,	/* Mmap file. */
+	open:			generic_file_open,	/* Open file. */
+	flush:			NULL,			/* . */
+	release:		NULL,			/* . */
+	fsync:			NULL,			/* . */
+	fasync:			NULL,			/* . */
+	lock:			NULL,			/* . */
+	readv:			NULL,			/* . */
+	writev:			NULL,			/* . */
+	sendpage:		NULL,			/* . */
+	get_unmapped_area:	NULL,			/* . */
+};
+
+struct inode_operations ntfs_file_inode_ops = {
+	create:		NULL,		/* . */
+	lookup:		NULL,		/* . */
+	link:		NULL,		/* . */
+	unlink:		NULL,		/* . */
+	symlink:	NULL,		/* . */
+	mkdir:		NULL,		/* . */
+	rmdir:		NULL,		/* . */
+	mknod:		NULL,		/* . */
+	rename:		NULL,		/* . */
+	readlink:	NULL,		/* . */
+	follow_link:	NULL,		/* . */
+	truncate:	NULL,		/* . */
+	permission:	NULL,		/* . */
+	revalidate:	NULL,		/* . */
+	setattr:	NULL,		/* . */
+	getattr:	NULL,		/* . */
+};
+
+#if 0
+/* NOTE: read, write, poll, fsync, readv, writev can be called without the big
+ * kernel lock held in all filesystems. */
+struct file_operations {
+	struct module *owner;
+	loff_t (*llseek) (struct file *, loff_t, int);
+	ssize_t (*read) (struct file *, char *, size_t, loff_t *);
+	ssize_t (*write) (struct file *, const char *, size_t, loff_t *);
+	int (*readdir) (struct file *, void *, filldir_t);
+	unsigned int (*poll) (struct file *, struct poll_table_struct *);
+	int (*ioctl) (struct inode *, struct file *, unsigned int,
+			unsigned long);
+	int (*mmap) (struct file *, struct vm_area_struct *);
+	int (*flush) (struct file *);
+	int (*release) (struct inode *, struct file *);
+	int (*fsync) (struct file *, struct dentry *, int datasync);
+	int (*fasync) (int, struct file *, int);
+	int (*lock) (struct file *, int, struct file_lock *);
+	ssize_t (*readv) (struct file *, const struct iovec *, unsigned long,
+			loff_t *);
+	ssize_t (*writev) (struct file *, const struct iovec *, unsigned long,
+			loff_t *);
+	ssize_t (*sendpage) (struct file *, struct page *, int, size_t,
+			loff_t *, int);
+	unsigned long (*get_unmapped_area)(struct file *, unsigned long,
+			unsigned long, unsigned long, unsigned long);
+};
+
+struct inode_operations {
+	int (*create) (struct inode *,struct dentry *,int);
+	struct dentry * (*lookup) (struct inode *,struct dentry *);
+	int (*link) (struct dentry *,struct inode *,struct dentry *);
+	int (*unlink) (struct inode *,struct dentry *);
+	int (*symlink) (struct inode *,struct dentry *,const char *);
+	int (*mkdir) (struct inode *,struct dentry *,int);
+	int (*rmdir) (struct inode *,struct dentry *);
+	int (*mknod) (struct inode *,struct dentry *,int,int);
+	int (*rename) (struct inode *, struct dentry *,
+			struct inode *, struct dentry *);
+	int (*readlink) (struct dentry *, char *,int);
+	int (*follow_link) (struct dentry *, struct nameidata *);
+	void (*truncate) (struct inode *);
+	int (*permission) (struct inode *, int);
+	int (*revalidate) (struct dentry *);
+	int (*setattr) (struct dentry *, struct iattr *);
+	int (*getattr) (struct dentry *, struct iattr *);
+};
+#endif
+
+struct file_operations ntfs_empty_file_ops = {
+	llseek:			NULL,			/* . */
+	read:			NULL,			/* . */
+	write:			NULL,			/* . */
+	readdir:		NULL,			/* . */
+	poll:			NULL,			/* . */
+	ioctl:			NULL,			/* . */
+	mmap:			NULL,			/* . */
+	open:			NULL,			/* . */
+	flush:			NULL,			/* . */
+	release:		NULL,			/* . */
+	fsync:			NULL,			/* . */
+	fasync:			NULL,			/* . */
+	lock:			NULL,			/* . */
+	readv:			NULL,			/* . */
+	writev:			NULL,			/* . */
+	sendpage:		NULL,			/* . */
+	get_unmapped_area:	NULL,			/* . */
+};
+
+struct inode_operations ntfs_empty_inode_ops = {
+	create:		NULL,		/* . */
+	lookup:		NULL,		/* . */
+	link:		NULL,		/* . */
+	unlink:		NULL,		/* . */
+	symlink:	NULL,		/* . */
+	mkdir:		NULL,		/* . */
+	rmdir:		NULL,		/* . */
+	mknod:		NULL,		/* . */
+	rename:		NULL,		/* . */
+	readlink:	NULL,		/* . */
+	follow_link:	NULL,		/* . */
+	truncate:	NULL,		/* . */
+	permission:	NULL,		/* . */
+	revalidate:	NULL,		/* . */
+	setattr:	NULL,		/* . */
+	getattr:	NULL,		/* . */
+};
+
diff -Nur linux/fs/ntfs/fs.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/fs.c
--- linux/fs/ntfs/fs.c	Mon Apr 29 21:50:45 2002
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/fs.c	Thu Jan  1 01:00:00 1970
@@ -1,1166 +0,0 @@
-/*
- * fs.c - NTFS driver for Linux 2.4.x
- *
- * Legato Systems, Inc. (http://www.legato.com) have sponsored Anton
- * Altaparmakov to develop NTFS on Linux since June 2001.
- *
- * Copyright (C) 1995-1997, 1999 Martin von Löwis
- * Copyright (C) 1996 Richard Russon
- * Copyright (C) 1996-1997 Régis Duchesne
- * Copyright (C) 2000-2001, Anton Altaparmakov (AIA)
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include "ntfstypes.h"
-#include "struct.h"
-#include "util.h"
-#include "inode.h"
-#include "super.h"
-#include "dir.h"
-#include "support.h"
-#include "macros.h"
-#include "sysctl.h"
-#include "attr.h"
-#include <linux/module.h>
-#include <asm/uaccess.h>
-#include <linux/locks.h>
-#include <linux/init.h>
-#include <linux/smp_lock.h>
-#include <linux/blkdev.h>
-#include <asm/page.h>
-#include <linux/nls.h>
-#include <linux/ntfs_fs.h>
-
-/* Forward declarations. */
-static struct inode_operations ntfs_dir_inode_operations;
-static struct file_operations ntfs_dir_operations;
-
-#define ITEM_SIZE 2040
-
-/* Io functions to user space. */
-static void ntfs_putuser(ntfs_io* dest, void *src, ntfs_size_t len)
-{
-	copy_to_user(dest->param, src, len);
-	dest->param += len;
-}
-
-#ifdef CONFIG_NTFS_RW
-struct ntfs_getuser_update_vm_s {
-	const char *user;
-	struct inode *ino;
-	loff_t off;
-};
-
-static void ntfs_getuser_update_vm(void *dest, ntfs_io *src, ntfs_size_t len)
-{
-	struct ntfs_getuser_update_vm_s *p = src->param;
-	
-	copy_from_user(dest, p->user, len);
-	p->user += len;
-	p->off += len;
-}
-#endif
-
-/* loff_t is 64 bit signed, so is cool. */
-static ssize_t ntfs_read(struct file *filp, char *buf, size_t count,loff_t *off)
-{
-	int error;
-	ntfs_io io;
-	ntfs_attribute *attr;
-	ntfs_inode *ino = NTFS_LINO2NINO(filp->f_dentry->d_inode);
-
-	/* Inode is not properly initialized. */
-	if (!ino)
-		return -EINVAL;
-	ntfs_debug(DEBUG_OTHER, "ntfs_read %x, %Lx, %x ->",
-		   (unsigned)ino->i_number, (unsigned long long)*off,
-		   (unsigned)count);
-	attr = ntfs_find_attr(ino, ino->vol->at_data, NULL);
-	/* Inode has no unnamed data attribute. */
-	if (!attr) {
-		ntfs_debug(DEBUG_OTHER, "ntfs_read: $DATA not found!\n");
-		return -EINVAL;
-	}
-	if (attr->flags & ATTR_IS_ENCRYPTED)
-		return -EACCES;
-	/* Read the data. */
-	io.fn_put = ntfs_putuser;
-	io.fn_get = 0;
-	io.param = buf;
-	io.size = count;
-	error = ntfs_read_attr(ino, ino->vol->at_data, NULL, *off, &io);
-	if (error && !io.size) {
-		ntfs_debug(DEBUG_OTHER, "ntfs_read: read_attr failed with "
-				"error %i, io size %u.\n", error, io.size);
-		return error;
-	}
-	*off += io.size;
-	ntfs_debug(DEBUG_OTHER, "ntfs_read: finished. read %u bytes.\n",
-								io.size);
-	return io.size;
-}
-
-#ifdef CONFIG_NTFS_RW
-static ssize_t ntfs_write(struct file *filp, const char *buf, size_t count,
-		loff_t *pos)
-{
-	int err;
-	struct inode *vfs_ino = filp->f_dentry->d_inode;
-	ntfs_inode *ntfs_ino = NTFS_LINO2NINO(vfs_ino);
-	ntfs_attribute *data;
-	ntfs_io io;
-	struct ntfs_getuser_update_vm_s param;
-
-	if (!ntfs_ino)
-		return -EINVAL;
-	ntfs_debug(DEBUG_LINUX, __FUNCTION__ "(): Entering for inode 0x%lx, "
-			"*pos 0x%Lx, count 0x%x.\n", ntfs_ino->i_number, *pos,
-			count);
-	/* Allows to lock fs ro at any time. */
-	if (vfs_ino->i_sb->s_flags & MS_RDONLY)
-		return -EROFS;
-	data = ntfs_find_attr(ntfs_ino, ntfs_ino->vol->at_data, NULL);
-	if (!data)
-		return -EINVAL;
-	/* Evaluating O_APPEND is the file system's job... */
-	if (filp->f_flags & O_APPEND)
-		*pos = vfs_ino->i_size;
-	if (!data->resident && *pos + count > data->allocated) {
-		err = ntfs_extend_attr(ntfs_ino, data, *pos + count);
-		if (err < 0)
-			return err;
-	}
-	param.user = buf;
-	param.ino = vfs_ino;
-	param.off = *pos;
-	io.fn_put = 0;
-	io.fn_get = ntfs_getuser_update_vm;
-	io.param = &param;
-	io.size = count;
-	io.do_read = 0;
-	err = ntfs_readwrite_attr(ntfs_ino, data, *pos, &io);
-	ntfs_debug(DEBUG_LINUX, __FUNCTION__ "(): Returning %i\n", -err);
-	if (!err) {
-		*pos += io.size;
-		if (*pos > vfs_ino->i_size)
-			vfs_ino->i_size = *pos;
-		mark_inode_dirty(vfs_ino);
-		return io.size;
-	}
-	return err;
-}
-#endif
-
-struct ntfs_filldir {
-	struct inode *dir;
-	filldir_t filldir;
-	unsigned int type;
-	u32 ph, pl;
-	void *dirent;
-	char *name;
-	int namelen;
-	int ret_code;
-};
-
-static int ntfs_printcb(ntfs_u8 *entry, void *param)
-{
-	unsigned long inum = NTFS_GETU64(entry) & 0xffffffffffff;
-	struct ntfs_filldir *nf = param;
-	u32 flags = NTFS_GETU32(entry + 0x48);
-	char show_sys_files = 0;
-	u8 name_len = NTFS_GETU8(entry + 0x50);
-	u8 name_type = NTFS_GETU8(entry + 0x51);
-	int err;
-	unsigned file_type;
-
-	switch (nf->type) {
-	case ngt_dos:
-		/* Don't display long names. */
-		if (!(name_type & 2))
-			return 0;
-		break;
-	case ngt_nt:
-		/* Don't display short-only names. */
-		if ((name_type & 3) == 2)
-			return 0;
-		break;
-	case ngt_posix:
-		break;
-	case ngt_full:
-		show_sys_files = 1;
-		break;
-	default:
-		BUG();
-	}
-	err = ntfs_encodeuni(NTFS_INO2VOL(nf->dir), (ntfs_u16*)(entry + 0x52),
-			name_len, &nf->name, &nf->namelen);
-	if (err) {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Skipping "
-				"unrepresentable file.\n");
-		err = 0;
-		goto err_ret;
-	}
-	if (!show_sys_files && inum < 0x10UL) {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Skipping system "
-				"file (%s).\n", nf->name);
-		err = 0;
-		goto err_ret;
-	}
-	/* Do not return ".", as this is faked. */
-	if (nf->namelen == 1 && nf->name[0] == '.') {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Skipping \".\"\n");
-		err = 0;
-		goto err_ret;
-	}
-	nf->name[nf->namelen] = 0;
-	if (flags & 0x10000000) /* FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT */
-		file_type = DT_DIR;
-	else
-		file_type = DT_REG;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Calling filldir for %s with "
-			"len %i, f_pos 0x%Lx, inode %lu, %s.\n",
-			nf->name, nf->namelen, (loff_t)(nf->ph << 16) | nf->pl,
-			inum, file_type == DT_DIR ? "DT_DIR" : "DT_REG");
-	/*
-	 * Userspace side of filldir expects an off_t rather than an loff_t.
-	 * And it also doesn't like the most significant bit being set as it
-	 * then considers the value to be negative. Thus this implementation
-	 * limits the number of index records to 32766, which should be plenty.
-	 */
-	err = nf->filldir(nf->dirent, nf->name, nf->namelen,
-			(loff_t)(nf->ph << 16) | nf->pl, inum, file_type);
-	if (err)
-		nf->ret_code = err;
-err_ret:
-	nf->namelen = 0;
-	ntfs_free(nf->name);
-	nf->name = NULL;
-	return err;
-}
-
-/*
- * readdir returns '.', then '..', then the directory entries in sequence.
- * As the root directory contains an entry for itself, '.' is not emulated for
- * the root directory.
- */
-static int ntfs_readdir(struct file* filp, void *dirent, filldir_t filldir)
-{
-	struct inode *dir = filp->f_dentry->d_inode;
-	int err;
-	struct ntfs_filldir cb;
-
-	cb.ret_code = 0;
-	cb.pl = filp->f_pos & 0xffff;
-	cb.ph = (filp->f_pos >> 16) & 0x7fff;
-	filp->f_pos = (loff_t)(cb.ph << 16) | cb.pl;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Entering for inode %lu, "
-			"f_pos 0x%Lx, i_mode 0x%x, i_count %lu.\n", dir->i_ino,
-			filp->f_pos, (unsigned int)dir->i_mode,
-			atomic_read(&dir->i_count));
-	if (!cb.ph) {
-		/* Start of directory. Emulate "." and "..". */
-		if (!cb.pl) {
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Calling "
-				    "filldir for . with len 1, f_pos 0x%Lx, "
-				    "inode %lu, DT_DIR.\n", filp->f_pos,
-				    dir->i_ino);
-			cb.ret_code = filldir(dirent, ".", 1, filp->f_pos,
-				    dir->i_ino, DT_DIR);
-			if (cb.ret_code)
-				goto done;
-			cb.pl++;
-			filp->f_pos = (loff_t)(cb.ph << 16) | cb.pl;
-		}
-		if (cb.pl == (u32)1) {
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Calling "
-				    "filldir for .. with len 2, f_pos 0x%Lx, "
-				    "inode %lu, DT_DIR.\n", filp->f_pos,
-				    filp->f_dentry->d_parent->d_inode->i_ino);
-			cb.ret_code = filldir(dirent, "..", 2, filp->f_pos,
-				    filp->f_dentry->d_parent->d_inode->i_ino,
-				    DT_DIR);
-			if (cb.ret_code)
-				goto done;
-			cb.pl++;
-			filp->f_pos = (loff_t)(cb.ph << 16) | cb.pl;
-		}
-	} else if (cb.ph >= 0x7fff)
-		/* End of directory. */
-		goto done;
-	cb.dir = dir;
-	cb.filldir = filldir;
-	cb.dirent = dirent;
-	cb.type = NTFS_INO2VOL(dir)->ngt;
-	do {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Looking for next "
-				"file using ntfs_getdir_unsorted(), f_pos "
-				"0x%Lx.\n", (loff_t)(cb.ph << 16) | cb.pl);
-		err = ntfs_getdir_unsorted(NTFS_LINO2NINO(dir), &cb.ph, &cb.pl,
-				ntfs_printcb, &cb);
-	} while (!err && !cb.ret_code && cb.ph < 0x7fff);
-	filp->f_pos = (loff_t)(cb.ph << 16) | cb.pl;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After ntfs_getdir_unsorted()"
-			" calls, f_pos 0x%Lx.\n", filp->f_pos);
-	if (!err) {
-done:
-#ifdef DEBUG
-		if (!cb.ret_code)
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): EOD, f_pos "
-					"0x%Lx, returning 0.\n", filp->f_pos);
-		else 
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): filldir "
-					"returned %i, returning 0, f_pos "
-					"0x%Lx.\n", cb.ret_code, filp->f_pos);
-#endif
-		return 0;
-	}
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Returning %i, f_pos 0x%Lx.\n",
-			err, filp->f_pos);
-	return err;
-}
-
-/* Copied from vfat driver. */
-static int simple_getbool(char *s, int *setval)
-{
-	if (s) {
-		if (!strcmp(s, "1") || !strcmp(s, "yes") || !strcmp(s, "true"))
-			*setval = 1;
-		else if (!strcmp(s, "0") || !strcmp(s, "no") ||
-							!strcmp(s, "false"))
-			*setval = 0;
-		else
-			return 0;
-	} else
-		*setval = 1;
-	return 1;
-}
-
-/*
- * This needs to be outside parse_options() otherwise a remount will reset
- * these unintentionally.
- */
-static void init_ntfs_super_block(ntfs_volume* vol)
-{
-	vol->uid = vol->gid = 0;
-	vol->umask = 0077;
-	vol->ngt = ngt_nt;
-	vol->nls_map = (void*)-1;
-	vol->mft_zone_multiplier = -1;
-}
-
-/* Parse the (re)mount options. */
-static int parse_options(ntfs_volume *vol, char *opt)
-{
-	char *value;		/* Defaults if not specified and !remount. */
-	ntfs_uid_t uid = -1;	/* 0, root user only */
-	ntfs_gid_t gid = -1;	/* 0, root user only */
-	int umask = -1;		/* 0077, owner access only */
-	unsigned int ngt = -1;	/* ngt_nt */
-	void *nls_map = NULL;	/* Try to load the default NLS. */
-	int use_utf8 = -1;	/* If no NLS specified and loading the default
-				   NLS failed use utf8. */
-	int mft_zone_mul = -1;	/* 1 */
-
-	if (!opt)
-		goto done;
-	for (opt = strtok(opt, ","); opt; opt = strtok(NULL, ",")) {
-		if ((value = strchr(opt, '=')) != NULL)
-			*value ++= '\0';
-		if (strcmp(opt, "uid") == 0) {
-			if (!value || !*value)
-				goto needs_arg;
-			uid = simple_strtoul(value, &value, 0);
-			if (*value) {
-				printk(KERN_ERR "NTFS: uid invalid argument\n");
-				return 0;
-			}
-		} else if (strcmp(opt, "gid") == 0) {
-			if (!value || !*value)
-				goto needs_arg;
-			gid = simple_strtoul(value, &value, 0);
-			if (*value) {
-				printk(KERN_ERR "NTFS: gid invalid argument\n");
-				return 0;
-			}
-		} else if (strcmp(opt, "umask") == 0) {
-			if (!value || !*value)
-				goto needs_arg;
-			umask = simple_strtoul(value, &value, 0);
-			if (*value) {
-				printk(KERN_ERR "NTFS: umask invalid "
-						"argument\n");
-				return 0;
-			}
-		} else if (strcmp(opt, "mft_zone_multiplier") == 0) {
-			unsigned long ul;
-
-			if (!value || !*value)
-				goto needs_arg;
-			ul = simple_strtoul(value, &value, 0);
-			if (*value) {
-				printk(KERN_ERR "NTFS: mft_zone_multiplier "
-						"invalid argument\n");
-				return 0;
-			}
-			if (ul >= 1 && ul <= 4)
-				mft_zone_mul = ul;
-			else {
-				mft_zone_mul = 1;
-				printk(KERN_WARNING "NTFS: mft_zone_multiplier "
-					      "out of range. Setting to 1.\n");
-			}
-		} else if (strcmp(opt, "posix") == 0) {
-			int val;
-			if (!value || !*value)
-				goto needs_arg;
-			if (!simple_getbool(value, &val))
-				goto needs_bool;
-			ngt = val ? ngt_posix : ngt_nt;
-		} else if (strcmp(opt, "show_sys_files") == 0) {
-			int val = 0;
-			if (!value || !*value)
-				val = 1;
-			else if (!simple_getbool(value, &val))
-				goto needs_bool;
-			ngt = val ? ngt_full : ngt_nt;
-		} else if (strcmp(opt, "iocharset") == 0) {
-			if (!value || !*value)
-				goto needs_arg;
-			nls_map = load_nls(value);
-			if (!nls_map) {
-				printk(KERN_ERR "NTFS: charset not found");
-				return 0;
-			}
-		} else if (strcmp(opt, "utf8") == 0) {
-			int val = 0;
-			if (!value || !*value)
-				val = 1;
-			else if (!simple_getbool(value, &val))
-				goto needs_bool;
-			use_utf8 = val;
-		} else {
-			printk(KERN_ERR "NTFS: unkown option '%s'\n", opt);
-			return 0;
-		}
-	}
-done:
-	if (use_utf8 == -1) {
-		/* utf8 was not specified at all. */
-		if (!nls_map) {
-			/*
-			 * No NLS was specified. If first mount, load the
-			 * default NLS, otherwise don't change the NLS setting.
-			 */
-			if (vol->nls_map == (void*)-1)
-				vol->nls_map = load_nls_default();
-		} else {
-			/* If an NLS was already loaded, unload it first. */
-			if (vol->nls_map && vol->nls_map != (void*)-1)
-				unload_nls(vol->nls_map);
-			/* Use the specified NLS. */
-			vol->nls_map = nls_map;
-		}
-	} else {
-		/* utf8 was specified. */
-		if (use_utf8 && nls_map) {
-			unload_nls(nls_map);
-			printk(KERN_ERR "NTFS: utf8 cannot be combined with "
-					"iocharset.\n");
-			return 0;
-		}
-		/* If an NLS was already loaded, unload it first. */
-		if (vol->nls_map && vol->nls_map != (void*)-1)
-			unload_nls(vol->nls_map);
-		if (!use_utf8) {
-			/* utf8 was specified as false. */
-			if (!nls_map)
-				/* No NLS was specified, load the default. */
-				vol->nls_map = load_nls_default();
-			else
-				/* Use the specified NLS. */
-				vol->nls_map = nls_map;
-		} else
-			/* utf8 was specified as true. */
-			vol->nls_map = NULL;
-	}
-	if (uid != -1)
-		vol->uid = uid;
-	if (gid != -1)
-		vol->gid = gid;
-	if (umask != -1)
-		vol->umask = (ntmode_t)umask;
-	if (ngt != -1)
-		vol->ngt = ngt;
-	if (mft_zone_mul != -1) {
-		/* mft_zone_multiplier was specified. */
-		if (vol->mft_zone_multiplier != -1) {
-			/* This is a remount, ignore a change and warn user. */
-			if (vol->mft_zone_multiplier != mft_zone_mul)
-				printk(KERN_WARNING "NTFS: Ignoring changes in "
-						"mft_zone_multiplier on "
-						"remount. If you want to "
-						"change this you need to "
-						"umount and mount again.\n");
-		} else
-			/* Use the specified multiplier. */
-			vol->mft_zone_multiplier = mft_zone_mul;
-	} else if (vol->mft_zone_multiplier == -1)
-		/* No multiplier specified and first mount, so set default. */
-		vol->mft_zone_multiplier = 1;
-	return 1;
-needs_arg:
-	printk(KERN_ERR "NTFS: %s needs an argument", opt);
-	return 0;
-needs_bool:
-	printk(KERN_ERR "NTFS: %s needs boolean argument", opt);
-	return 0;
-}
-			
-static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *d)
-{
-	struct inode *res = 0;
-	char *item = 0;
-	ntfs_iterate_s walk;
-	int err;
-	
-	ntfs_debug(DEBUG_NAME1, __FUNCTION__ "(): Looking up %s in directory "
-			"ino 0x%x.\n", d->d_name.name, (unsigned)dir->i_ino);
-	walk.name = NULL;
-	walk.namelen = 0;
-	/* Convert to wide string. */
-	err = ntfs_decodeuni(NTFS_INO2VOL(dir), (char*)d->d_name.name,
-			       d->d_name.len, &walk.name, &walk.namelen);
-	if (err)
-		goto err_ret;
-	item = ntfs_malloc(ITEM_SIZE);
-	if (!item) {
-		err = -ENOMEM;
-		goto err_ret;
-	}
-	/* ntfs_getdir will place the directory entry into item, and the first
-	 * long long is the MFT record number. */
-	walk.type = BY_NAME;
-	walk.dir = NTFS_LINO2NINO(dir);
-	walk.result = item;
-	if (ntfs_getdir_byname(&walk))
-		res = iget(dir->i_sb, NTFS_GETU32(item));
-	d_add(d, res);
-	ntfs_free(item);
-	ntfs_free(walk.name);
-	/* Always return success, the dcache will handle negative entries. */
-	return NULL;
-err_ret:
-	ntfs_free(walk.name);
-	return ERR_PTR(err);
-}
-
-static struct file_operations ntfs_file_operations = {
-	llseek:		generic_file_llseek,
-	read:		ntfs_read,
-#ifdef CONFIG_NTFS_RW
-	write:		ntfs_write,
-#endif
-	open:		generic_file_open,
-};
-
-static struct inode_operations ntfs_inode_operations;
-
-#ifdef CONFIG_NTFS_RW
-static int ntfs_create(struct inode* dir, struct dentry *d, int mode)
-{
-	struct inode *r = 0;
-	ntfs_inode *ino = 0;
-	ntfs_volume *vol;
-	int error = 0;
-	ntfs_attribute *si;
-
-	r = new_inode(dir->i_sb);
-	if (!r) {
-		error = -ENOMEM;
-		goto fail;
-	}
-	ntfs_debug(DEBUG_OTHER, "ntfs_create %s\n", d->d_name.name);
-	vol = NTFS_INO2VOL(dir);
-	ino = NTFS_LINO2NINO(r);
-	error = ntfs_alloc_file(NTFS_LINO2NINO(dir), ino, (char*)d->d_name.name,
-				d->d_name.len);
-	if (error) {
-		ntfs_error("ntfs_alloc_file FAILED: error = %i", error);
-		goto fail;
-	}
-	/* Not doing this one was causing a huge amount of corruption! Now the
-	 * bugger bytes the dust! (-8 (AIA) */
-	r->i_ino = ino->i_number;
-	error = ntfs_update_inode(ino);
-	if (error)
-		goto fail;
-	error = ntfs_update_inode(NTFS_LINO2NINO(dir));
-	if (error)
-		goto fail;
-	r->i_uid = vol->uid;
-	r->i_gid = vol->gid;
-	/* FIXME: dirty? dev? */
-	/* Get the file modification times from the standard information. */
-	si = ntfs_find_attr(ino, vol->at_standard_information, NULL);
-	if (si) {
-		char *attr = si->d.data;
-		r->i_atime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 0x18));
-		r->i_ctime = ntfs_ntutc2unixutc(NTFS_GETU64(attr));
-		r->i_mtime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 8));
-	}
-	/* It's not a directory */
-	r->i_op = &ntfs_inode_operations;
-	r->i_fop = &ntfs_file_operations;
-	r->i_mode = S_IFREG | S_IRUGO;
-#ifdef CONFIG_NTFS_RW
-	r->i_mode |= S_IWUGO;
-#endif
-	r->i_mode &= ~vol->umask;
-	insert_inode_hash(r);
-	d_instantiate(d, r);
-	return 0;
- fail:
-	if (r)
-		iput(r);
-	return error;
-}
-
-static int _linux_ntfs_mkdir(struct inode *dir, struct dentry* d, int mode)
-{
-	int error;
-	struct inode *r = 0;
-	ntfs_volume *vol;
-	ntfs_inode *ino;
-	ntfs_attribute *si;
-
-	ntfs_debug (DEBUG_DIR1, "mkdir %s in %x\n", d->d_name.name, dir->i_ino);
-	error = -ENAMETOOLONG;
-	if (d->d_name.len > /* FIXME: */ 255)
-		goto out;
-	error = -EIO;
-	r = new_inode(dir->i_sb);
-	if (!r)
-		goto out;
-	vol = NTFS_INO2VOL(dir);
-	ino = NTFS_LINO2NINO(r);
-	error = ntfs_mkdir(NTFS_LINO2NINO(dir), d->d_name.name, d->d_name.len,
-			   ino);
-	if (error)
-		goto out;
-	/* Not doing this one was causing a huge amount of corruption! Now the
-	 * bugger bytes the dust! (-8 (AIA) */
-	r->i_ino = ino->i_number;
-	r->i_uid = vol->uid;
-	r->i_gid = vol->gid;
-	si = ntfs_find_attr(ino, vol->at_standard_information, NULL);
-	if (si) {
-		char *attr = si->d.data;
-		r->i_atime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 0x18));
-		r->i_ctime = ntfs_ntutc2unixutc(NTFS_GETU64(attr));
-		r->i_mtime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 8));
-	}
-	/* It's a directory. */
-	r->i_op = &ntfs_dir_inode_operations;
-	r->i_fop = &ntfs_dir_operations;
-	r->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
-#ifdef CONFIG_NTFS_RW
-	r->i_mode |= S_IWUGO;
-#endif
-	r->i_mode &= ~vol->umask;	
-	
-	insert_inode_hash(r);
-	d_instantiate(d, r);
-	error = 0;
- out:
- 	ntfs_debug (DEBUG_DIR1, "mkdir returns %d\n", error);
-	return error;
-}
-#endif
-
-static struct file_operations ntfs_dir_operations = {
-	read:		generic_read_dir,
-	readdir:	ntfs_readdir,
-};
-
-static struct inode_operations ntfs_dir_inode_operations = {
-	lookup:		ntfs_lookup,
-#ifdef CONFIG_NTFS_RW
-	create:		ntfs_create,
-	mkdir:		_linux_ntfs_mkdir,
-#endif
-};
-
-/* ntfs_read_inode() is called by the Virtual File System (the kernel layer 
- * that deals with filesystems) when iget is called requesting an inode not
- * already present in the inode table. Typically filesystems have separate
- * inode_operations for directories, files and symlinks. */
-static void ntfs_read_inode(struct inode* inode)
-{
-	ntfs_volume *vol;
-	ntfs_inode *ino;
-	ntfs_attribute *data;
-	ntfs_attribute *si;
-
-	vol = NTFS_INO2VOL(inode);
-	inode->i_mode = 0;
-	ntfs_debug(DEBUG_OTHER, "ntfs_read_inode 0x%lx\n", inode->i_ino);
-	switch (inode->i_ino) {
-		/* Those are loaded special files. */
-	case FILE_Mft:
-		if (!vol->mft_ino || ((vol->ino_flags & 1) == 0))
-			goto sys_file_error;
-		ntfs_memcpy(&inode->u.ntfs_i, vol->mft_ino, sizeof(ntfs_inode));
-		ino = vol->mft_ino;
-		vol->mft_ino = &inode->u.ntfs_i;
-		vol->ino_flags &= ~1;
-		ntfs_free(ino);
-		ino = vol->mft_ino;
-		ntfs_debug(DEBUG_OTHER, "Opening $MFT!\n");
-		break;
-	case FILE_MftMirr:
-		if (!vol->mftmirr || ((vol->ino_flags & 2) == 0))
-			goto sys_file_error;
-		ntfs_memcpy(&inode->u.ntfs_i, vol->mftmirr, sizeof(ntfs_inode));
-		ino = vol->mftmirr;
-		vol->mftmirr = &inode->u.ntfs_i;
-		vol->ino_flags &= ~2;
-		ntfs_free(ino);
-		ino = vol->mftmirr;
-		ntfs_debug(DEBUG_OTHER, "Opening $MFTMirr!\n");
-		break;
-	case FILE_BitMap:
-		if (!vol->bitmap || ((vol->ino_flags & 4) == 0))
-			goto sys_file_error;
-		ntfs_memcpy(&inode->u.ntfs_i, vol->bitmap, sizeof(ntfs_inode));
-		ino = vol->bitmap;
-		vol->bitmap = &inode->u.ntfs_i;
-		vol->ino_flags &= ~4;
-		ntfs_free(ino);
-		ino = vol->bitmap;
-		ntfs_debug(DEBUG_OTHER, "Opening $Bitmap!\n");
-		break;
-	case FILE_LogFile ... FILE_AttrDef:
-	/* No need to log root directory accesses. */
-	case FILE_Boot ... FILE_UpCase:
-		ntfs_debug(DEBUG_OTHER, "Opening system file %i!\n",
-				inode->i_ino);
-	default:
-		ino = &inode->u.ntfs_i;
-		if (!ino || ntfs_init_inode(ino, NTFS_INO2VOL(inode),
-								inode->i_ino))
-		{
-			ntfs_debug(DEBUG_OTHER, "NTFS: Error loading inode "
-					"0x%x\n", (unsigned int)inode->i_ino);
-			return;
-		}
-	}
-	/* Set uid/gid from mount options */
-	inode->i_uid = vol->uid;
-	inode->i_gid = vol->gid;
-	inode->i_nlink = 1;
-	/* Use the size of the data attribute as file size */
-	data = ntfs_find_attr(ino, vol->at_data, NULL);
-	if (!data)
-		inode->i_size = 0;
-	else
-		inode->i_size = data->size;
-	/* Get the file modification times from the standard information. */
-	si = ntfs_find_attr(ino, vol->at_standard_information, NULL);
-	if (si) {
-		char *attr = si->d.data;
-		inode->i_atime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 0x18));
-		inode->i_ctime = ntfs_ntutc2unixutc(NTFS_GETU64(attr));
-		inode->i_mtime = ntfs_ntutc2unixutc(NTFS_GETU64(attr + 8));
-	}
-	/* If it has an index root, it's a directory. */
-	if (ntfs_find_attr(ino, vol->at_index_root, "$I30")) {
-		ntfs_attribute *at;
-		at = ntfs_find_attr(ino, vol->at_index_allocation, "$I30");
-		inode->i_size = at ? at->size : 0;
-		inode->i_op = &ntfs_dir_inode_operations;
-		inode->i_fop = &ntfs_dir_operations;
-		inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
-	} else {
-		inode->i_op = &ntfs_inode_operations;
-		inode->i_fop = &ntfs_file_operations;
-		inode->i_mode = S_IFREG | S_IRUGO;
-	}
-#ifdef CONFIG_NTFS_RW
-	if (!data || !(data->flags & (ATTR_IS_COMPRESSED | ATTR_IS_ENCRYPTED)))
-		inode->i_mode |= S_IWUGO;
-#endif
-	inode->i_mode &= ~vol->umask;
-	return;
-sys_file_error:
-	ntfs_error("Critical error. Tried to call ntfs_read_inode() before we "
-		"have completed read_super() or VFS error.\n");
-	// FIXME: Should we panic() at this stage?
-}
-
-#ifdef CONFIG_NTFS_RW
-static void ntfs_write_inode(struct inode *ino, int unused)
-{
-	lock_kernel();
-	ntfs_debug(DEBUG_LINUX, "ntfs_write_inode 0x%x\n", ino->i_ino);
-	ntfs_update_inode(NTFS_LINO2NINO(ino));
-	unlock_kernel();
-}
-#endif
-
-static void _ntfs_clear_inode(struct inode *inode)
-{
-	ntfs_inode *ino;
-	ntfs_volume *vol;
-	
-	lock_kernel();
-	ntfs_debug(DEBUG_OTHER, "_ntfs_clear_inode 0x%x\n", inode->i_ino);
-	vol = NTFS_INO2VOL(inode);
-	if (!vol)
-		ntfs_error("_ntfs_clear_inode: vol = NTFS_INO2VOL(inode) is "
-				"NULL.\n");
-	switch (inode->i_ino) {
-	case FILE_Mft:
-		if (vol->mft_ino && ((vol->ino_flags & 1) == 0)) {
-			ino = (ntfs_inode*)ntfs_malloc(sizeof(ntfs_inode));
-			ntfs_memcpy(ino, &inode->u.ntfs_i, sizeof(ntfs_inode));
-			vol->mft_ino = ino;
-			vol->ino_flags |= 1;
-			goto unl_out;
-		}
-		break;
-	case FILE_MftMirr:
-		if (vol->mftmirr && ((vol->ino_flags & 2) == 0)) {
-			ino = (ntfs_inode*)ntfs_malloc(sizeof(ntfs_inode));
-			ntfs_memcpy(ino, &inode->u.ntfs_i, sizeof(ntfs_inode));
-			vol->mftmirr = ino;
-			vol->ino_flags |= 2;
-			goto unl_out;
-		}
-		break;
-	case FILE_BitMap:
-		if (vol->bitmap && ((vol->ino_flags & 4) == 0)) {
-			ino = (ntfs_inode*)ntfs_malloc(sizeof(ntfs_inode));
-			ntfs_memcpy(ino, &inode->u.ntfs_i, sizeof(ntfs_inode));
-			vol->bitmap = ino;
-			vol->ino_flags |= 4;
-			goto unl_out;
-		}
-		break;
-	default:
-		/* Nothing. Just clear the inode and exit. */
-	}
-	ntfs_clear_inode(&inode->u.ntfs_i);
-unl_out:
-	unlock_kernel();
-	return;
-}
-
-/* Called when umounting a filesystem by do_umount() in fs/super.c. */
-static void ntfs_put_super(struct super_block *sb)
-{
-	ntfs_volume *vol;
-
-	ntfs_debug(DEBUG_OTHER, "ntfs_put_super\n");
-	vol = NTFS_SB2VOL(sb);
-	ntfs_release_volume(vol);
-	if (vol->nls_map)
-		unload_nls(vol->nls_map);
-	ntfs_debug(DEBUG_OTHER, "ntfs_put_super: done\n");
-}
-
-/* Called by the kernel when asking for stats. */
-static int ntfs_statfs(struct super_block *sb, struct statfs *sf)
-{
-	struct inode *mft;
-	ntfs_volume *vol;
-	__s64 size;
-	int error;
-
-	ntfs_debug(DEBUG_OTHER, "ntfs_statfs\n");
-	vol = NTFS_SB2VOL(sb);
-	sf->f_type = NTFS_SUPER_MAGIC;
-	sf->f_bsize = vol->cluster_size;
-	error = ntfs_get_volumesize(NTFS_SB2VOL(sb), &size);
-	if (error)
-		return error;
-	sf->f_blocks = size;	/* Volumesize is in clusters. */
-	size = (__s64)ntfs_get_free_cluster_count(vol->bitmap);
-	/* Just say zero if the call failed. */
-	if (size < 0LL)
-		size = 0;
-	sf->f_bfree = sf->f_bavail = size;
-	ntfs_debug(DEBUG_OTHER, "ntfs_statfs: calling mft = iget(sb, "
-			"FILE_Mft)\n");
-	mft = iget(sb, FILE_Mft);
-	ntfs_debug(DEBUG_OTHER, "ntfs_statfs: iget(sb, FILE_Mft) returned "
-			"0x%x\n", mft);
-	if (!mft)
-		return -EIO;
-	sf->f_files = mft->i_size >> vol->mft_record_size_bits;
-	ntfs_debug(DEBUG_OTHER, "ntfs_statfs: calling iput(mft)\n");
-	iput(mft);
-	/* Should be read from volume. */
-	sf->f_namelen = 255;
-	return 0;
-}
-
-/* Called when remounting a filesystem by do_remount_sb() in fs/super.c. */
-static int ntfs_remount_fs(struct super_block *sb, int *flags, char *options)
-{
-	if (!parse_options(NTFS_SB2VOL(sb), options))
-		return -EINVAL;
-	return 0;
-}
-
-/* Define the super block operation that are implemented */
-static struct super_operations ntfs_super_operations = {
-	read_inode:	ntfs_read_inode,
-#ifdef CONFIG_NTFS_RW
-	write_inode:	ntfs_write_inode,
-#endif
-	put_super:	ntfs_put_super,
-	statfs:		ntfs_statfs,
-	remount_fs:	ntfs_remount_fs,
-	clear_inode:	_ntfs_clear_inode,
-};
-
-/**
- * is_boot_sector_ntfs - check an NTFS boot sector for validity
- * @b:		buffer containing bootsector to check
- * 
- * Check whether @b contains a valid NTFS boot sector.
- * Return 1 if @b is a valid NTFS bootsector or 0 if not.
- */
-static int is_boot_sector_ntfs(ntfs_u8 *b)
-{
-	ntfs_u32 i;
-
-	/* FIXME: We don't use checksumming yet as NT4(SP6a) doesn't either...
-	 * But we might as well have the code ready to do it. (AIA) */
-#if 0
-	/* Calculate the checksum. */
-	if (b < b + 0x50) {
-		ntfs_u32 *u;
-		ntfs_u32 *bi = (ntfs_u32 *)(b + 0x50);
-		
-		for (u = bi, i = 0; u < bi; ++u)
-			i += NTFS_GETU32(*u);
-	}
-#endif
-	/* Check magic is "NTFS    " */
-	if (b[3] != 0x4e) goto not_ntfs;
-	if (b[4] != 0x54) goto not_ntfs;
-	if (b[5] != 0x46) goto not_ntfs;
-	if (b[6] != 0x53) goto not_ntfs;
-	for (i = 7; i < 0xb; ++i)
-		if (b[i] != 0x20) goto not_ntfs;
-	/* Check bytes per sector value is between 512 and 4096. */
-	if (b[0xb] != 0) goto not_ntfs;
-	if (b[0xc] > 0x10) goto not_ntfs;
-	/* Check sectors per cluster value is valid. */
-	switch (b[0xd]) {
-	case 1: case 2: case 4: case 8: case 16:
-	case 32: case 64: case 128:
-		break;
-	default:
-		goto not_ntfs;
-	}
-	/* Check reserved sectors value and four other fields are zero. */
-	for (i = 0xe; i < 0x15; ++i) 
-		if (b[i] != 0) goto not_ntfs;
-	if (b[0x16] != 0) goto not_ntfs;
-	if (b[0x17] != 0) goto not_ntfs;
-	for (i = 0x20; i < 0x24; ++i)
-		if (b[i] != 0) goto not_ntfs;
-	/* Check clusters per file record segment value is valid. */
-	if (b[0x40] < 0xe1 || b[0x40] > 0xf7) {
-		switch (b[0x40]) {
-		case 1: case 2: case 4: case 8: case 16: case 32: case 64:
-			break;
-		default:
-			goto not_ntfs;
-		}
-	}
-	/* Check clusters per index block value is valid. */
-	if (b[0x44] < 0xe1 || b[0x44] > 0xf7) {
-		switch (b[0x44]) {
-		case 1: case 2: case 4: case 8: case 16: case 32: case 64:
-			break;
-		default:
-			goto not_ntfs;
-		}
-	}
-	return 1;
-not_ntfs:
-	return 0;
-}
-
-/* Called to mount a filesystem by read_super() in fs/super.c.
- * Return a super block, the main structure of a filesystem.
- *
- * NOTE : Don't store a pointer to an option, as the page containing the
- * options is freed after ntfs_read_super() returns.
- *
- * NOTE : A context switch can happen in kernel code only if the code blocks
- * (= calls schedule() in kernel/sched.c). */
-struct super_block *ntfs_read_super(struct super_block *sb, void *options,
-		int silent)
-{
-	ntfs_volume *vol;
-	struct buffer_head *bh;
-	int i, to_read, blocksize;
-
-	ntfs_debug(DEBUG_OTHER, "ntfs_read_super\n");
-	vol = NTFS_SB2VOL(sb);
-	init_ntfs_super_block(vol);
-	if (!parse_options(vol, (char*)options))
-		goto ntfs_read_super_vol;
-	blocksize = get_hardsect_size(sb->s_dev);
-	if (blocksize < 512)
-		blocksize = 512;
-	if (set_blocksize(sb->s_dev, blocksize) < 0) {
-		ntfs_error("Unable to set blocksize %d.\n", blocksize);
-		goto ntfs_read_super_vol;
-	}
-	sb->s_blocksize = blocksize;
-	/* Read the super block (boot block). */
-	if (!(bh = sb_bread(sb, 0))) {
-		ntfs_error("Reading super block failed\n");
-		goto ntfs_read_super_unl;
-	}
-	ntfs_debug(DEBUG_OTHER, "Done reading boot block\n");
-	/* Check for valid 'NTFS' boot sector. */
-	if (!is_boot_sector_ntfs(bh->b_data)) {
-		ntfs_debug(DEBUG_OTHER, "Not a NTFS volume\n");
-		bforget(bh);
-		goto ntfs_read_super_unl;
-	}
-	ntfs_debug(DEBUG_OTHER, "Going to init volume\n");
-	if (ntfs_init_volume(vol, bh->b_data) < 0) {
-		ntfs_debug(DEBUG_OTHER, "Init volume failed.\n");
-		bforget(bh);
-		goto ntfs_read_super_unl;
-	}
-	ntfs_debug(DEBUG_OTHER, "$Mft at cluster 0x%lx\n", vol->mft_lcn);
-	brelse(bh);
-	NTFS_SB(vol) = sb;
-	if (vol->cluster_size > PAGE_SIZE) {
-		ntfs_error("Partition cluster size is not supported yet (it "
-			   "is > max kernel blocksize).\n");
-		goto ntfs_read_super_unl;
-	}
-	ntfs_debug(DEBUG_OTHER, "Done to init volume\n");
-	/* Inform the kernel that a device block is a NTFS cluster. */
-	sb->s_blocksize = vol->cluster_size;
-	sb->s_blocksize_bits = vol->cluster_size_bits;
-	if (blocksize != vol->cluster_size &&
-			set_blocksize(sb->s_dev, sb->s_blocksize) < 0) {
-		ntfs_error("Cluster size too small for device.\n");
-		goto ntfs_read_super_unl;
-	}
-	ntfs_debug(DEBUG_OTHER, "set_blocksize\n");
-	/* Allocate an MFT record (MFT record can be smaller than a cluster). */
-	i = vol->cluster_size;
-	if (i < vol->mft_record_size)
-		i = vol->mft_record_size;
-	if (!(vol->mft = ntfs_malloc(i)))
-		goto ntfs_read_super_unl;
-
-	/* Read at least the MFT record for $Mft. */
-	to_read = vol->mft_clusters_per_record;
-	if (to_read < 1)
-		to_read = 1;
-	for (i = 0; i < to_read; i++) {
-		if (!(bh = sb_bread(sb, vol->mft_lcn + i))) {
-			ntfs_error("Could not read $Mft record 0\n");
-			goto ntfs_read_super_mft;
-		}
-		ntfs_memcpy(vol->mft + ((__s64)i << vol->cluster_size_bits),
-						bh->b_data, vol->cluster_size);
-		brelse(bh);
-		ntfs_debug(DEBUG_OTHER, "Read cluster 0x%x\n",
-							 vol->mft_lcn + i);
-	}
-	/* Check and fixup this MFT record */
-	if (!ntfs_check_mft_record(vol, vol->mft)){
-		ntfs_error("Invalid $Mft record 0\n");
-		goto ntfs_read_super_mft;
-	}
-	/* Inform the kernel about which super operations are available. */
-	sb->s_op = &ntfs_super_operations;
-	sb->s_magic = NTFS_SUPER_MAGIC;
-	sb->s_maxbytes = ~0ULL >> 1;
-	ntfs_debug(DEBUG_OTHER, "Reading special files\n");
-	if (ntfs_load_special_files(vol)) {
-		ntfs_error("Error loading special files\n");
-		goto ntfs_read_super_mft;
-	}
-	ntfs_debug(DEBUG_OTHER, "Getting RootDir\n");
-	/* Get the root directory. */
-	if (!(sb->s_root = d_alloc_root(iget(sb, FILE_root)))) {
-		ntfs_error("Could not get root dir inode\n");
-		goto ntfs_read_super_mft;
-	}
-ntfs_read_super_ret:
-	ntfs_debug(DEBUG_OTHER, "read_super: done\n");
-	return sb;
-ntfs_read_super_mft:
-	ntfs_free(vol->mft);
-ntfs_read_super_unl:
-ntfs_read_super_vol:
-	sb = NULL;
-	goto ntfs_read_super_ret;
-}
-
-/* Define the filesystem */
-static DECLARE_FSTYPE_DEV(ntfs_fs_type, "ntfs", ntfs_read_super);
-
-static int __init init_ntfs_fs(void)
-{
-	/* Comment this if you trust klogd. There are reasons not to trust it */
-#if defined(DEBUG) && !defined(MODULE)
-	console_verbose();
-#endif
-	printk(KERN_NOTICE "NTFS driver v" NTFS_VERSION " [Flags: R/"
-#ifdef CONFIG_NTFS_RW
-			"W"
-#else
-			"O"
-#endif
-#ifdef DEBUG
-			" DEBUG"
-#endif
-#ifdef MODULE
-			" MODULE"
-#endif
-			"]\n");
-	SYSCTL(1);
-	ntfs_debug(DEBUG_OTHER, "registering %s\n", ntfs_fs_type.name);
-	/* Add this filesystem to the kernel table of filesystems. */
-	return register_filesystem(&ntfs_fs_type);
-}
-
-static void __exit exit_ntfs_fs(void)
-{
-	SYSCTL(0);
-	ntfs_debug(DEBUG_OTHER, "unregistering %s\n", ntfs_fs_type.name);
-	unregister_filesystem(&ntfs_fs_type);
-}
-
-EXPORT_NO_SYMBOLS;
-/*
- * Not strictly true. The driver was written originally by Martin von Löwis.
- * I am just maintaining and rewriting it.
- */
-MODULE_AUTHOR("Anton Altaparmakov <aia21@cus.cam.ac.uk>");
-MODULE_DESCRIPTION("Linux NTFS driver");
-MODULE_LICENSE("GPL");
-#ifdef DEBUG
-MODULE_PARM(ntdebug, "i");
-MODULE_PARM_DESC(ntdebug, "Debug level");
-#endif
-
-module_init(init_ntfs_fs)
-module_exit(exit_ntfs_fs)
-
diff -Nur linux/fs/ntfs/inode.c linux-2.4.18-ntfs-2.0.6a/fs/ntfs/inode.c
--- linux/fs/ntfs/inode.c	Fri Dec 21 18:42:03 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/inode.c	Mon May  6 23:16:24 2002
@@ -1,2317 +1,1372 @@
-/*
- * inode.c
+/**
+ * inode.c - NTFS kernel inode handling. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
  *
- * Copyright (C) 1995-1999 Martin von Löwis
- * Copyright (C) 1996 Albert D. Cahalan
- * Copyright (C) 1996-1997 Régis Duchesne
- * Copyright (C) 1998 Joseph Malicki
- * Copyright (C) 1999 Steve Dodd
- * Copyright (C) 2000-2001 Anton Altaparmakov (AIA)
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "ntfstypes.h"
-#include "ntfsendian.h"
-#include "struct.h"
-#include "inode.h"
-#include <linux/errno.h>
-#include "macros.h"
-#include "attr.h"
-#include "super.h"
-#include "dir.h"
-#include "support.h"
-#include "util.h"
-#include <linux/ntfs_fs.h>
-#include <linux/smp_lock.h>
-
-typedef struct {
-	int recno;
-	unsigned char *record;
-} ntfs_mft_record;
-
-typedef struct {
-	int size;
-	int count;
-	ntfs_mft_record *records;
-} ntfs_disk_inode;
 
-static void ntfs_fill_mft_header(ntfs_u8 *mft, int rec_size, int seq_no,
-		int links, int flags)
+#include <linux/pagemap.h>
+
+#include "ntfs.h"
+
+ntfs_inode *ntfs_alloc_inode(void)
 {
-	int fixup_ofs = 0x2a;
-	int fixup_cnt = rec_size / NTFS_SECTOR_SIZE + 1;
-	int attr_ofs = (fixup_ofs + 2 * fixup_cnt + 7) & ~7;
-
-	NTFS_PUTU32(mft + 0x00, 0x454c4946);	/* FILE */
-	NTFS_PUTU16(mft + 0x04, fixup_ofs);	/* Offset to fixup. */
-	NTFS_PUTU16(mft + 0x06, fixup_cnt);	/* Number of fixups. */
-	NTFS_PUTU64(mft + 0x08, 0);		/* Logical sequence number. */
-	NTFS_PUTU16(mft + 0x10, seq_no);	/* Sequence number. */
-	NTFS_PUTU16(mft + 0x12, links);		/* Hard link count. */
-	NTFS_PUTU16(mft + 0x14, attr_ofs);	/* Offset to attributes. */
-	NTFS_PUTU16(mft + 0x16, flags);		/* Flags: 1 = In use,
-							  2 = Directory. */
-	NTFS_PUTU32(mft + 0x18, attr_ofs + 8);	/* Bytes in use. */
-	NTFS_PUTU32(mft + 0x1c, rec_size);	/* Total allocated size. */
-	NTFS_PUTU64(mft + 0x20, 0);		/* Base mft record. */
-	NTFS_PUTU16(mft + 0x28, 0);		/* Next attr instance. */
-	NTFS_PUTU16(mft + fixup_ofs, 1);	/* Fixup word. */
-	NTFS_PUTU32(mft + attr_ofs, (__u32)-1);	/* End of attributes marker. */
+	ntfs_inode *ni = (ntfs_inode *)kmem_cache_alloc(ntfs_inode_cache,
+			SLAB_NOFS);
+	ntfs_debug("Entering.");
+	if (unlikely(!ni))
+		ntfs_error(NULL, "Allocation of NTFS inode structure failed.");
+	return ni;
 }
 
-/*
- * Search in an inode an attribute by type and name. 
- * FIXME: Check that when attributes are inserted all attribute list
- * attributes are expanded otherwise need to modify this function to deal
- * with attribute lists. (AIA)
- */
-ntfs_attribute *ntfs_find_attr(ntfs_inode *ino, int type, char *name)
+void ntfs_destroy_inode(ntfs_inode *ni)
 {
-	int i;
-	
-	if (!ino) {
-		ntfs_error("ntfs_find_attr: NO INODE!\n");
-		return 0;
-	}
-	for (i = 0; i < ino->attr_count; i++) {
-		if (type < ino->attrs[i].type)
-			return 0;
-		if (type == ino->attrs[i].type) {
-			if (!name) {
-				if (!ino->attrs[i].name)
-					return ino->attrs + i;
-			} else if (ino->attrs[i].name &&
-				   !ntfs_ua_strncmp(ino->attrs[i].name, name,
-						    strlen(name)))
-				return ino->attrs + i;
-		}
-	}
-	return 0;
+	ntfs_debug("Entering.");
+	BUG_ON(atomic_read(&ni->mft_count) || !atomic_dec_and_test(&ni->count));
+	kmem_cache_free(ntfs_inode_cache, ni);
 }
 
-/*
- * Insert all attributes from the record mftno of the MFT in the inode ino.
- * If mftno is a base mft record we abort as soon as we find the attribute
- * list, but only on the first pass. We will get called later when the attribute
- * list attribute is being parsed so we need to distinguish the two cases.
- * FIXME: We should be performing structural consistency checks. (AIA)
- * Return 0 on success or -errno on error.
+/**
+ * __ntfs_init_inode - initialize ntfs specific part of an inode
+ *
+ * Initialize an ntfs inode to defaults.
+ *
+ * Return zero on success and -ENOMEM on error.
  */
-static int ntfs_insert_mft_attributes(ntfs_inode* ino, char *mft, int mftno)
+static void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)
 {
-	int i, error, type, len, present = 0;
-	char *it;
-
-	/* Check for duplicate extension record. */
-	for(i = 0; i < ino->record_count; i++)
-		if (ino->records[i] == mftno) {
-			if (i)
-				return 0;
-			present = 1;
-			break;
-		}
-	if (!present) {
-		/* (re-)allocate space if necessary. */
-		if (ino->record_count % 8 == 0)	{
-			int *new;
-
-			new = ntfs_malloc((ino->record_count + 8) *
-								sizeof(int));
-			if (!new)
-				return -ENOMEM;
-			if (ino->records) {
-				for (i = 0; i < ino->record_count; i++)
-					new[i] = ino->records[i];
-				ntfs_free(ino->records);
-			}
-			ino->records = new;
-		}
-		ino->records[ino->record_count] = mftno;
-		ino->record_count++;
-	}
-	it = mft + NTFS_GETU16(mft + 0x14); /* mft->attrs_offset */
-	do {
-		type = NTFS_GETU32(it);
-		len = NTFS_GETU32(it + 4);
-		if (type != -1) {
-			error = ntfs_insert_attribute(ino, it);
-			if (error)
-				return error;
-		}
-		/* If we have just processed the attribute list and this is
-		 * the first time we are parsing this (base) mft record then we
-		 * are done so that the attribute list gets parsed before the
-		 * entries in the base mft record. Otherwise we run into
-		 * problems with encountering attributes out of order and when
-		 * this happens with different attribute extents we die. )-:
-		 * This way we are ok as the attribute list is always sorted
-		 * fully and correctly. (-: */
-		if (type == 0x20 && !present)
-			return 0;
-		it += len;
-	} while (type != -1); /* Attribute listing ends with type -1. */
-	return 0;
+	ntfs_debug("Entering.");
+	memset(ni, 0, sizeof(ntfs_inode));
+	atomic_set(&ni->count, 1);
+	ni->vol = NULL;
+	init_run_list(&ni->run_list);
+	init_rwsem(&ni->mrec_lock);
+	atomic_set(&ni->mft_count, 0);
+	ni->page = NULL;
+	ni->attr_list = NULL;
+	init_run_list(&ni->attr_list_rl);
+	init_run_list(&ni->_IDM(bmp_rl));
+	init_MUTEX(&ni->extent_lock);
+	ni->_INE(base_ntfs_ino) = NULL;
+	ni->vol = NTFS_SB(sb);
+	return;
+}
+
+ntfs_inode *ntfs_new_inode(struct super_block *sb)
+{
+	ntfs_inode *ni = ntfs_alloc_inode();
+
+	ntfs_debug("Entering.");
+	if (ni)
+		__ntfs_init_inode(sb, ni);
+	return ni;
 }
 
-/*
- * Insert a single specific attribute from the record mftno of the MFT in the
- * inode ino. We disregard the attribute list assuming we have already parsed
- * it.
- * FIXME: We should be performing structural consistency checks. (AIA)
- * Return 0 on success or -errno on error.
+/**
+ * ntfs_is_extended_system_file - check if a file is in the $Extend directory
+ * @ctx:	initialized attribute search context
+ *
+ * Search all file name attributes in the inode described by the attribute
+ * search context @ctx and check if any of the names are in the $Extend system
+ * directory.
+ * 
+ * Return values:
+ *	   1: file is in $Extend directory
+ *	   0: file is not in $Extend directory
+ *	-EIO: file is corrupt
  */
-static int ntfs_insert_mft_attribute(ntfs_inode* ino, int mftno,
-		ntfs_u8 *attr)
+static int ntfs_is_extended_system_file(attr_search_context *ctx)
 {
-	int i, error, present = 0;
+	int nr_links;
 
-	/* Check for duplicate extension record. */
-	for(i = 0; i < ino->record_count; i++)
-		if (ino->records[i] == mftno) {
-			present = 1;
-			break;
-		}
-	if (!present) {
-		/* (re-)allocate space if necessary. */
-		if (ino->record_count % 8 == 0)	{
-			int *new;
-
-			new = ntfs_malloc((ino->record_count + 8) *
-								sizeof(int));
-			if (!new)
-				return -ENOMEM;
-			if (ino->records) {
-				for (i = 0; i < ino->record_count; i++)
-					new[i] = ino->records[i];
-				ntfs_free(ino->records);
-			}
-			ino->records = new;
-		}
-		ino->records[ino->record_count] = mftno;
-		ino->record_count++;
-	}
-	if (NTFS_GETU32(attr) == -1) {
-		ntfs_debug(DEBUG_FILE3, "ntfs_insert_mft_attribute: attribute "
-				"type is -1.\n");
-		return 0;
-	}
-	error = ntfs_insert_attribute(ino, attr);
-	if (error)
-		return error;
-	return 0;
-}
+	/* Restart search. */
+	reinit_attr_search_ctx(ctx);
 
-/* Read and insert all the attributes of an 'attribute list' attribute.
- * Return the number of remaining bytes in *plen. */
-static int parse_attributes(ntfs_inode *ino, ntfs_u8 *alist, int *plen)
-{
-	ntfs_u8 *mft, *attr;
-	int mftno, l, error;
-	int last_mft = -1;
-	int len = *plen;
-	int tries = 0;
-	
-	if (!ino->attr) {
-		ntfs_error("parse_attributes: called on inode 0x%x without a "
-				"loaded base mft record.\n", ino->i_number);
-		return -EINVAL;
-	}
-	mft = ntfs_malloc(ino->vol->mft_record_size);
-	if (!mft)
-		return -ENOMEM;
-	while (len > 8)	{
-		l = NTFS_GETU16(alist + 4);
-		if (l > len)
-			break;
-	        /* Process an attribute description. */
-		mftno = NTFS_GETU32(alist + 0x10); 
-			/* FIXME: The mft reference (alist + 0x10) is __s64.
-			* - Not a problem unless we encounter a huge partition.
-			* - Should be consistency checking the sequence numbers
-			*   though! This should maybe happen in 
-			*   ntfs_read_mft_record() itself and a hotfix could
-			*   then occur there or the user notified to run
-			*   ntfsck. (AIA) */
-		if (mftno != ino->i_number && mftno != last_mft) {
-continue_after_loading_mft_data:
-			last_mft = mftno;
-			error = ntfs_read_mft_record(ino->vol, mftno, mft);
-			if (error) {
-				if (error == -EINVAL && !tries)
-					goto force_load_mft_data;
-failed_reading_mft_data:
-				ntfs_debug(DEBUG_FILE3, "parse_attributes: "
-					"ntfs_read_mft_record(mftno = 0x%x) "
-					"failed\n", mftno);
-				ntfs_free(mft);
-				return error;
-			}
-		}
-		attr = ntfs_find_attr_in_mft_rec(
-				ino->vol,		/* ntfs volume */
-				mftno == ino->i_number ?/* mft record is: */
-					ino->attr:	/*   base record */
-					mft,		/*   extension record */
-				NTFS_GETU32(alist + 0),	/* type */
-				(wchar_t*)(alist + alist[7]),	/* name */
-				alist[6], 		/* name length */
-				1,			/* ignore case */
-				NTFS_GETU16(alist + 24)	/* instance number */
-				);
-		if (!attr) {
-			ntfs_error("parse_attributes: mft records 0x%x and/or "
-				       "0x%x corrupt!\n", ino->i_number, mftno);
-			ntfs_free(mft);
-			return -EINVAL; /* FIXME: Better error code? (AIA) */
-		}
-		error = ntfs_insert_mft_attribute(ino, mftno, attr);
-		if (error) {
-			ntfs_debug(DEBUG_FILE3, "parse_attributes: "
-				"ntfs_insert_mft_attribute(mftno 0x%x, "
-				"attribute type 0x%x) failed\n", mftno,
-				NTFS_GETU32(alist + 0));
-			ntfs_free(mft);
-			return error;
+	/* Get number of hard links. */
+	nr_links = le16_to_cpu(ctx->mrec->link_count);
+
+	/* Loop through all hard links. */
+	while (lookup_attr(AT_FILE_NAME, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		FILE_NAME_ATTR *file_name_attr;
+		ATTR_RECORD *attr = ctx->attr;
+		u8 *p, *p2;
+
+		nr_links--;
+		/*
+		 * Maximum sanity checking as we are called on an inode that
+		 * we suspect might be corrupt.
+		 */
+		p = (u8*)attr + le32_to_cpu(attr->length);
+		if (p < (u8*)ctx->mrec || (u8*)p > (u8*)ctx->mrec +
+				le32_to_cpu(ctx->mrec->bytes_in_use)) {
+err_corrupt_attr:
+			ntfs_error(ctx->ntfs_ino->vol->sb, "Corrupt file name "
+					"attribute. You should run chkdsk.");
+			return -EIO;
 		}
-		len -= l;
-		alist += l;
-	}
-	ntfs_free(mft);
-	*plen = len;
-	return 0;
-force_load_mft_data:
-{
-	ntfs_u8 *mft2, *attr2;
-	int mftno2;
-	int last_mft2 = last_mft;
-	int len2 = len;
-	int error2;
-	int found2 = 0;
-	ntfs_u8 *alist2 = alist;
-	/*
-	 * We only get here if $DATA wasn't found in $MFT which only happens
-	 * on volume mount when $MFT has an attribute list and there are
-	 * attributes before $DATA which are inside extent mft records. So
-	 * we just skip forward to the $DATA attribute and read that. Then we
-	 * restart which is safe as an attribute will not be inserted twice.
-	 *
-	 * This still will not fix the case where the attribute list is non-
-	 * resident, larger than 1024 bytes, and the $DATA attribute list entry
-	 * is not in the first 1024 bytes. FIXME: This should be implemented
-	 * somehow! Perhaps by passing special error code up to
-	 * ntfs_load_attributes() so it keeps going trying to get to $DATA
-	 * regardless. Then it would have to restart just like we do here.
-	 */
-	mft2 = ntfs_malloc(ino->vol->mft_record_size);
-	if (!mft2) {
-		ntfs_free(mft);
-		return -ENOMEM;
-	}
-	ntfs_memcpy(mft2, mft, ino->vol->mft_record_size);
-	while (len2 > 8) {
-		l = NTFS_GETU16(alist2 + 4);
-		if (l > len2)
-			break;
-		if (NTFS_GETU32(alist2 + 0x0) < ino->vol->at_data) {
-			len2 -= l;
-			alist2 += l;
-			continue;
+		if (attr->non_resident) {
+			ntfs_error(ctx->ntfs_ino->vol->sb, "Non-resident file "
+					"name. You should run chkdsk.");
+			return -EIO;
 		}
-		if (NTFS_GETU32(alist2 + 0x0) > ino->vol->at_data) {
-			if (found2)
-				break;
-			/* Uh-oh! It really isn't there! */
-			ntfs_error("Either the $MFT is corrupt or, equally "
-					"likely, the $MFT is too complex for "
-					"the current driver to handle. Please "
-					"email the ntfs maintainer that you "
-					"saw this message. Thank you.\n");
-			goto failed_reading_mft_data;
-		}
-	        /* Process attribute description. */
-		mftno2 = NTFS_GETU32(alist2 + 0x10); 
-		if (mftno2 != ino->i_number && mftno2 != last_mft2) {
-			last_mft2 = mftno2;
-			error2 = ntfs_read_mft_record(ino->vol, mftno2, mft2);
-			if (error2) {
-				ntfs_debug(DEBUG_FILE3, "parse_attributes: "
-					"ntfs_read_mft_record(mftno2 = 0x%x) "
-					"failed\n", mftno2);
-				ntfs_free(mft2);
-				goto failed_reading_mft_data;
-			}
+		if (attr->flags) {
+			ntfs_error(ctx->ntfs_ino->vol->sb, "File name with "
+					"invalid flags. You should run "
+					"chkdsk.");
+			return -EIO;
 		}
-		attr2 = ntfs_find_attr_in_mft_rec(
-				ino->vol,		 /* ntfs volume */
-				mftno2 == ino->i_number ?/* mft record is: */
-					ino->attr:	 /*  base record */
-					mft2,		 /*  extension record */
-				NTFS_GETU32(alist2 + 0),	/* type */
-				(wchar_t*)(alist2 + alist2[7]),	/* name */
-				alist2[6], 		 /* name length */
-				1,			 /* ignore case */
-				NTFS_GETU16(alist2 + 24) /* instance number */
-				);
-		if (!attr2) {
-			ntfs_error("parse_attributes: mft records 0x%x and/or "
-				       "0x%x corrupt!\n", ino->i_number,
-				       mftno2);
-			ntfs_free(mft2);
-			goto failed_reading_mft_data;
-		}
-		error2 = ntfs_insert_mft_attribute(ino, mftno2, attr2);
-		if (error2) {
-			ntfs_debug(DEBUG_FILE3, "parse_attributes: "
-				"ntfs_insert_mft_attribute(mftno2 0x%x, "
-				"attribute2 type 0x%x) failed\n", mftno2,
-				NTFS_GETU32(alist2 + 0));
-			ntfs_free(mft2);
-			goto failed_reading_mft_data;
-		}
-		len2 -= l;
-		alist2 += l;
-		found2 = 1;
-	}
-	ntfs_free(mft2);
-	tries = 1;
-	goto continue_after_loading_mft_data;
-}
-}
-
-static void ntfs_load_attributes(ntfs_inode *ino)
-{
-	ntfs_attribute *alist;
-	int datasize;
-	int offset, len, delta;
-	char *buf;
-	ntfs_volume *vol = ino->vol;
-	
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 1\n", ino->i_number);
-	if (ntfs_insert_mft_attributes(ino, ino->attr, ino->i_number))
-		return;
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 2\n", ino->i_number);
-	alist = ntfs_find_attr(ino, vol->at_attribute_list, 0);
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 3\n", ino->i_number);
-	if (!alist)
-		return;
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 4\n", ino->i_number);
-	datasize = alist->size;
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x: alist->size = 0x%x\n",
-			ino->i_number, alist->size);
-	if (alist->resident) {
-		parse_attributes(ino, alist->d.data, &datasize);
-		return;
-	}
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 5\n", ino->i_number);
-	buf = ntfs_malloc(1024);
-	if (!buf)    /* FIXME: Should be passing error code to caller. (AIA) */
-		return;
-	delta = 0;
-	for (offset = 0; datasize; datasize -= len, offset += len) {
-		ntfs_io io;
-		
-		io.fn_put = ntfs_put;
-		io.fn_get = 0;
-		io.param = buf + delta;
-		len = 1024 - delta;
-		if (len > datasize)
-			len = datasize;
-		ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x: len = %i\n",
-						ino->i_number, len);
-		ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x: delta = %i\n",
-						ino->i_number, delta);
-		io.size = len;
-		if (ntfs_read_attr(ino, vol->at_attribute_list, 0, offset,
-				   &io))
-			ntfs_error("error in load_attributes\n");
-		delta += len;
-		ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x: after += len, "
-				"delta = %i\n", ino->i_number, delta);
-		parse_attributes(ino, buf, &delta);
-		ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x: after "
-				"parse_attr, delta = %i\n", ino->i_number,
-				delta);
-		if (delta)
-			/* Move remaining bytes to buffer start. */
-			ntfs_memmove(buf, buf + len - delta, delta);
-	}
-	ntfs_debug(DEBUG_FILE2, "load_attributes 0x%x 6\n", ino->i_number);
-	ntfs_free(buf);
-}
-	
-int ntfs_init_inode(ntfs_inode *ino, ntfs_volume *vol, int inum)
-{
-	char *buf;
-	int error;
-
-	ntfs_debug(DEBUG_FILE1, "Initializing inode 0x%x\n", inum);
-	ino->i_number = inum;
-	ino->vol = vol;
-	ino->attr = buf = ntfs_malloc(vol->mft_record_size);
-	if (!buf)
-		return -ENOMEM;
-	error = ntfs_read_mft_record(vol, inum, ino->attr);
-	if (error) {
-		ntfs_debug(DEBUG_OTHER, "Init inode: 0x%x failed\n", inum);
-		return error;
-	}
-	ntfs_debug(DEBUG_FILE2, "Init inode: got mft 0x%x\n", inum);
-	ino->sequence_number = NTFS_GETU16(buf + 0x10);
-	ino->attr_count = 0;
-	ino->record_count = 0;
-	ino->records = 0;
-	ino->attrs = 0;
-	ntfs_load_attributes(ino);
-	ntfs_debug(DEBUG_FILE2, "Init inode: done 0x%x\n", inum);
-	return 0;
-}
-
-void ntfs_clear_inode(ntfs_inode *ino)
-{
-	int i;
-	if (!ino->attr) {
-		ntfs_error("ntfs_clear_inode: double free\n");
-		return;
-	}
-	ntfs_free(ino->attr);
-	ino->attr = 0;
-	ntfs_free(ino->records);
-	ino->records = 0;
-	for (i = 0; i < ino->attr_count; i++) {
-		if (ino->attrs[i].name)
-			ntfs_free(ino->attrs[i].name);
-		if (ino->attrs[i].resident) {
-			if (ino->attrs[i].d.data)
-				ntfs_free(ino->attrs[i].d.data);
-		} else {
-			if (ino->attrs[i].d.r.runlist)
-				ntfs_vfree(ino->attrs[i].d.r.runlist);
+		if (!(attr->_ARA(resident_flags) & RESIDENT_ATTR_IS_INDEXED)) {
+			ntfs_error(ctx->ntfs_ino->vol->sb, "Unindexed file "
+					"name. You should run chkdsk.");
+			return -EIO;
 		}
+		file_name_attr = (FILE_NAME_ATTR*)((u8*)attr +
+				le16_to_cpu(attr->_ARA(value_offset)));
+		p2 = (u8*)attr + le32_to_cpu(attr->_ARA(value_length));
+		if (p2 < (u8*)attr || p2 > p)
+			goto err_corrupt_attr;
+		/* This attribute is ok, but is it in the $Extend directory? */
+		if (MREF_LE(file_name_attr->parent_directory) == FILE_Extend)
+			return 1;	/* YES, it's an extended system file. */
+	}
+	if (nr_links) {
+		ntfs_error(ctx->ntfs_ino->vol->sb, "Inode hard link count "
+				"doesn't match number of name attributes. You "
+				"should run chkdsk.");
+		return -EIO;
 	}
-	ntfs_free(ino->attrs);
-	ino->attrs = 0;
+	return 0;	/* NO, it is not an extended system file. */
 }
 
-/* Check and fixup a MFT record. */
-int ntfs_check_mft_record(ntfs_volume *vol, char *record)
-{
-	return ntfs_fixup_record(record, "FILE", vol->mft_record_size);
-}
-
-/* Return (in result) the value indicating the next available attribute 
- * chunk number. Works for inodes w/o extension records only. */
-int ntfs_allocate_attr_number(ntfs_inode *ino, int *result)
-{
-	if (ino->record_count != 1)
-		return -EOPNOTSUPP;
-	*result = NTFS_GETU16(ino->attr + 0x28);
-	NTFS_PUTU16(ino->attr + 0x28, (*result) + 1);
-	return 0;
-}
-
-/* Find the location of an attribute in the inode. A name of NULL indicates
- * unnamed attributes. Return pointer to attribute or NULL if not found. */
-char *ntfs_get_attr(ntfs_inode *ino, int attr, char *name)
-{
-	/* Location of first attribute. */
-	char *it = ino->attr + NTFS_GETU16(ino->attr + 0x14);
-	int type;
-	int len;
-	
-	/* Only check for magic DWORD here, fixup should have happened before.*/
-	if (!IS_MFT_RECORD(ino->attr))
-		return 0;
-	do {
-		type = NTFS_GETU32(it);
-		len = NTFS_GETU16(it + 4);
-		/* We found the attribute type. Is the name correct, too? */
-		if (type == attr) {
-			int namelen = NTFS_GETU8(it + 9);
-			char *name_it, *n = name;
-			/* Match given name and attribute name if present.
-			   Make sure attribute name is Unicode. */
-			if (!name) {
-				goto check_namelen;
-			} else if (namelen) {
-				for (name_it = it + NTFS_GETU16(it + 10);
-				     namelen; n++, name_it += 2, namelen--)
-					if (*name_it != *n || name_it[1])
-						break;
-check_namelen:
-				if (!namelen)
-					break;
-			}
-		}
-		it += len;
-	} while (type != -1); /* List of attributes ends with type -1. */
-	if (type == -1)
-		return 0;
-	return it;
-}
-
-__s64 ntfs_get_attr_size(ntfs_inode *ino, int type, char *name)
-{
-	ntfs_attribute *attr = ntfs_find_attr(ino, type, name);
-	if (!attr)
-		return 0;
-	return
-		attr->size;
-}
-	
-int ntfs_attr_is_resident(ntfs_inode *ino, int type, char *name)
-{
-	ntfs_attribute *attr = ntfs_find_attr(ino, type, name);
-	if (!attr)
-		return 0;
-	return attr->resident;
-}
-	
-/*
- * A run is coded as a type indicator, an unsigned length, and a signed cluster
- * offset.
- * . To save space, length and offset are fields of variable length. The low
- *   nibble of the type indicates the width of the length :), the high nibble
- *   the width of the offset.
- * . The first offset is relative to cluster 0, later offsets are relative to
- *   the previous cluster.
+/**
+ * ntfs_read_inode - read an inode from its device
+ * @vi:		inode to read
+ *
+ * ntfs_read_inode() is called from the VFS iget() function to read the inode
+ * described by @vi into memory from the device.
  *
- * This function decodes a run. Length is an output parameter, data and cluster
- * are in/out parameters.
+ * The only fields in @vi that we need to/can look at when the function is
+ * called are i_sb, pointing to the mounted device's super block, and i_ino,
+ * the number of the inode to load.
+ *
+ * ntfs_read_inode() maps, pins and locks the mft record number i_ino for
+ * reading and sets up the necessary @vi fields as well as initializing
+ * the ntfs inode.
+ *
+ * Q: What locks are held when the function is called?
+ * A: i_state has I_LOCK set, hence the inode is locked, also
+ *    i_count is set to 1, so it is not going to go away
+ *    i_flags is set to 0 and we have no business touching it. Only an ioctl()
+ *    is allowed to write to them. We should of course be honouring them but
+ *    we need to do that using the IS_* macros defined in include/linux/fs.h.
+ *    In any case ntfs_read_inode() has nothing to do with i_flags at all.
  */
-int ntfs_decompress_run(unsigned char **data, int *length, 
-			ntfs_cluster_t *cluster, int *ctype)
+void ntfs_read_inode(struct inode *vi)
 {
-	unsigned char type = *(*data)++;
-	*ctype = 0;
-	switch (type & 0xF) {
-	case 1: 
-		*length = NTFS_GETS8(*data);
-		break;
-	case 2: 
-		*length = NTFS_GETS16(*data);
-		break;
-	case 3: 
-		*length = NTFS_GETS24(*data);
-		break;
-        case 4: 
-		*length = NTFS_GETS32(*data);
-		break;
-        	/* Note: cases 5-8 are probably pointless to code, since how
-		 * many runs > 4GB of length are there? At the most, cases 5
-		 * and 6 are probably necessary, and would also require making
-		 * length 64-bit throughout. */
-	default:
-		ntfs_error("Can't decode run type field 0x%x\n", type);
-		return -1;
-	}
-//	ntfs_debug(DEBUG_FILE3, "ntfs_decompress_run: length = 0x%x\n",*length);
-	if (*length < 0)
-	{
-		ntfs_error("Negative run length decoded\n");
-		return -1;
-	}
-	*data += (type & 0xF);
-	switch (type & 0xF0) {
-	case 0:
-		*ctype = 2;
-		break;
-	case 0x10:
-		*cluster += NTFS_GETS8(*data);
-		break;
-	case 0x20:
-		*cluster += NTFS_GETS16(*data);
-		break;
-	case 0x30:
-		*cluster += NTFS_GETS24(*data);
-		break;
-	case 0x40:
-		*cluster += NTFS_GETS32(*data);
-		break;
-#if 0 /* Keep for future, in case ntfs_cluster_t ever becomes 64bit. */
-	case 0x50: 
-		*cluster += NTFS_GETS40(*data);
-		break;
-	case 0x60: 
-		*cluster += NTFS_GETS48(*data);
-		break;
-	case 0x70: 
-		*cluster += NTFS_GETS56(*data);
-		break;
-	case 0x80: 
-		*cluster += NTFS_GETS64(*data);
-		break;
-#endif
-	default:
-		ntfs_error("Can't decode run type field 0x%x\n", type);
-		return -1;
-	}
-//	ntfs_debug(DEBUG_FILE3, "ntfs_decompress_run: cluster = 0x%x\n",
-//								*cluster);
-	*data += (type >> 4);
-	return 0;
-}
+	ntfs_volume *vol = NTFS_SB(vi->i_sb);
+	ntfs_inode *ni;
+	MFT_RECORD *m;
+	STANDARD_INFORMATION *si;
+	attr_search_context *ctx;
+	int err;
 
-static void dump_runlist(const ntfs_runlist *rl, const int rlen);
+	ntfs_debug("Entering for i_ino 0x%lx.", vi->i_ino);
 
-/*
- * FIXME: ntfs_readwrite_attr() has the effect of writing @dest to @offset of
- * the attribute value of the attribute @attr in the in memory inode @ino.
- * If the attribute value of @attr is non-resident the value's contents at
- * @offset are actually written to disk (from @dest). The on disk mft record
- * describing the non-resident attribute value is not updated!
- * If the attribute value is resident then the value is written only in
- * memory. The on disk mft record containing the value is not written to disk.
- * A possible fix would be to call ntfs_update_inode() before returning. (AIA)
- */
-/* Reads l bytes of the attribute (attr, name) of ino starting at offset on
- * vol into buf. Returns the number of bytes read in the ntfs_io struct.
- * Returns 0 on success, errno on failure */
-int ntfs_readwrite_attr(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-		ntfs_io *dest)
-{
-	int rnum, s_vcn, error, clustersizebits;
-	ntfs_cluster_t cluster, s_cluster, vcn, len;
-	__s64 l, chunk, copied;
-
-	ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): %s 0x%x bytes at offset "
-			"0x%Lx %s inode 0x%x, attr type 0x%x.\n",
-			dest->do_read ? "Read" : "Write", dest->size, offset,
-			dest->do_read ? "from" : "to", ino->i_number,
-			attr->type);
-	l = dest->size;
-	if (l == 0)
-		return 0;
-	if (dest->do_read) {
-		/* If read _starts_ beyond end of stream, return nothing. */
-		if (offset >= attr->size) {
-			dest->size = 0;
-			return 0;
-		}
-		/* If read _extends_ beyond end of stream, return as much
-		 * initialised data as we have. */
-		if (offset + l >= attr->size)
-			l = dest->size = attr->size - offset;
+	if (vi->i_ino) {
+		ni = ntfs_new_inode(vi->i_sb);
+		if (!ni) {
+			ntfs_error(vi->i_sb, "Failed to allocate a new inode");
+			err = ENOMEM;
+			goto err_out;
+		}
+		vi->u.generic_ip = ni;
+		ni->vfs_inode = vi;
+		ni->mft_no = vi->i_ino;
 	} else {
-		/*
-		 * If write extends beyond _allocated_ size, extend attribute,
-		 * updating attr->allocated and attr->size in the process. (AIA)
-		 */
-		if ((!attr->resident && offset + l > attr->allocated) ||
-				(attr->resident && offset + l > attr->size)) {
-			error = ntfs_resize_attr(ino, attr, offset + l);
-			if (error)
-				return error;
-		}
-		if (!attr->resident) {
-			/* Has amount of data increased? */
-			if (offset + l > attr->size)
-				attr->size = offset + l;
-			/* Has amount of initialised data increased? */
-			if (offset + l > attr->initialized) {
-				/* FIXME: Clear the section between the old
-			 	 * initialised length and the write start.
-				 * (AIA) */
-				attr->initialized = offset + l;
-			}
-		}
-	}
-	if (attr->resident) {
-		if (dest->do_read)
-			dest->fn_put(dest, (ntfs_u8*)attr->d.data + offset, l);
-		else
-			dest->fn_get((ntfs_u8*)attr->d.data + offset, dest, l);
-		dest->size = l;
-		return 0;
-	}
-	if (dest->do_read) {
-		/* Read uninitialized data. */
-		if (offset >= attr->initialized)
-			return ntfs_read_zero(dest, l);
-		if (offset + l > attr->initialized) {
-			dest->size = chunk = attr->initialized - offset;
-			error = ntfs_readwrite_attr(ino, attr, offset, dest);
-			if (error || (dest->size != chunk && (error = -EIO, 1)))
-				return error;
-			dest->size += l - chunk;
-			return ntfs_read_zero(dest, l - chunk);
-		}
-		if (attr->flags & ATTR_IS_COMPRESSED)
-			return ntfs_read_compressed(ino, attr, offset, dest);
-	} else {
-		if (attr->flags & ATTR_IS_COMPRESSED)
-			return ntfs_write_compressed(ino, attr, offset, dest);
-	}
-	vcn = 0;
-	clustersizebits = ino->vol->cluster_size_bits;
-	s_vcn = offset >> clustersizebits;
-	for (rnum = 0; rnum < attr->d.r.len &&
-			vcn + attr->d.r.runlist[rnum].len <= s_vcn; rnum++)
-		vcn += attr->d.r.runlist[rnum].len;
-	if (rnum == attr->d.r.len) {
-		ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): EOPNOTSUPP: "
-			"inode = 0x%x, rnum = %i, offset = 0x%Lx, vcn = 0x%x, "
-			"s_vcn = 0x%x.\n", ino->i_number, rnum, offset, vcn,
-			s_vcn);
-		dump_runlist(attr->d.r.runlist, attr->d.r.len);
-		/*FIXME: Should extend runlist. */
-		return -EOPNOTSUPP;
-	}
-	copied = 0;
-	while (l) {
-		s_vcn = offset >> clustersizebits;
-		cluster = attr->d.r.runlist[rnum].lcn;
-		len = attr->d.r.runlist[rnum].len;
-		s_cluster = cluster + s_vcn - vcn;
-		chunk = ((__s64)(vcn + len) << clustersizebits) - offset;
-		if (chunk > l)
-			chunk = l;
-		dest->size = chunk;
-		error = ntfs_getput_clusters(ino->vol, s_cluster, offset -
-				((__s64)s_vcn << clustersizebits), dest);
-		if (error) {
-			ntfs_error("Read/write error.\n");
-			dest->size = copied;
-			return error;
-		}
-		l -= chunk;
-		copied += chunk;
-		offset += chunk;
-		if (l && offset >= ((__s64)(vcn + len) << clustersizebits)) {
-			rnum++;
-			vcn += len;
-			cluster = attr->d.r.runlist[rnum].lcn;
-			len = attr->d.r.runlist[rnum].len;
-		}
+		ni = NTFS_I(vi);
 	}
-	dest->size = copied;
-	return 0;
-}
 
-int ntfs_read_attr(ntfs_inode *ino, int type, char *name, __s64 offset,
-		   ntfs_io *buf)
-{
-	ntfs_attribute *attr;
+	/* Setup the generic vfs inode parts now. */
 
-	buf->do_read = 1;
-	attr = ntfs_find_attr(ino, type, name);
-	if (!attr) {
-		ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): attr 0x%x not found "
-				"in inode 0x%x\n", type, ino->i_number);
-		return -EINVAL;
+	/* This is the optimal IO size (for stat), not the fs block size. */
+	vi->i_blksize = PAGE_CACHE_SIZE;
+	/*
+	 * This is for checking whether an inode has changed w.r.t. a file so
+	 * that the file can be updated if necessary (compare with f_version).
+	 */
+	vi->i_version = ++event;
+	/* Set uid and gid from the mount options. */
+	vi->i_uid = vol->uid;
+	vi->i_gid = vol->gid;
+	/* Set to zero so we can use logical operations on it from here on. */
+	vi->i_mode = 0;
+
+	/* Map, pin and lock the mft record for reading. */
+	m = map_mft_record(READ, ni);
+	if (IS_ERR(m)) {
+		err = PTR_ERR(m);
+		goto err_out;
+	}
+
+	/* Is the record in use? */
+	if (!(m->flags & MFT_RECORD_IN_USE)) {
+		ntfs_error(vi->i_sb, "Inode is not in use! You should "
+				"run chkdsk.");
+		goto unm_err_out;
+	}
+
+	/* Is this an extent mft record / inode? Treat same as if not in use. */
+	if (m->base_mft_record) {
+		ntfs_error(vi->i_sb, "Inode is an extent inode! iget() "
+				"not possible. You should run chkdsk.");
+		goto unm_err_out;
 	}
-	return ntfs_readwrite_attr(ino, attr, offset, buf);
-}
 
-int ntfs_write_attr(ntfs_inode *ino, int type, char *name, __s64 offset,
-		    ntfs_io *buf)
-{
-	ntfs_attribute *attr;
-	
-	buf->do_read = 0;
-	attr = ntfs_find_attr(ino, type, name);
-	if (!attr) {
-		ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): attr 0x%x not found "
-				"in inode 0x%x\n", type, ino->i_number);
-		return -EINVAL;
-	}
-	return ntfs_readwrite_attr(ino, attr, offset, buf);
-}
+	/* Transfer information from mft record into vfs and ntfs inodes. */
 
-/* -2 = error, -1 = hole, >= 0 means real disk cluster (lcn). */
-int ntfs_vcn_to_lcn(ntfs_inode *ino, int vcn)
-{
-	int rnum;
-	ntfs_attribute *data;
-	
-	data = ntfs_find_attr(ino, ino->vol->at_data, 0);
-	if (!data || data->resident || data->flags & (ATTR_IS_COMPRESSED |
-			ATTR_IS_ENCRYPTED))
-		return -2;
-	if (data->size <= (__s64)vcn << ino->vol->cluster_size_bits)
-		return -2;
-	if (data->initialized <= (__s64)vcn << ino->vol->cluster_size_bits)
-		return -1;
-	for (rnum = 0; rnum < data->d.r.len &&
-			vcn >= data->d.r.runlist[rnum].len; rnum++)
-		vcn -= data->d.r.runlist[rnum].len;
-	if (data->d.r.runlist[rnum].lcn >= 0)
-		return data->d.r.runlist[rnum].lcn + vcn;
-	return data->d.r.runlist[rnum].lcn + vcn;
-}
-
-static int allocate_store(ntfs_volume *vol, ntfs_disk_inode *store, int count)
-{
-	int i;
-	
-	if (store->count > count)
-		return 0;
-	if (store->size < count) {
-		ntfs_mft_record *n = ntfs_malloc((count + 4) * 
-						 sizeof(ntfs_mft_record));
-		if (!n)
-			return -ENOMEM;
-		if (store->size) {
-			for (i = 0; i < store->size; i++)
-				n[i] = store->records[i];
-			ntfs_free(store->records);
-		}
-		store->size = count + 4;
-		store->records = n;
-	}
-	for (i = store->count; i < count; i++) {
-		store->records[i].record = ntfs_malloc(vol->mft_record_size);
-		if (!store->records[i].record)
-			return -ENOMEM;
-		store->count++;
-	}
-	return 0;
-}
-
-static void deallocate_store(ntfs_disk_inode* store)
-{
-	int i;
-	
-	for (i = 0; i < store->count; i++)
-		ntfs_free(store->records[i].record);
-	ntfs_free(store->records);
-	store->count = store->size = 0;
-	store->records = 0;
-}
+	/* Cache the sequence number in the ntfs inode. */
+	ni->seq_no = le16_to_cpu(m->sequence_number);
 
-/**
- * layout_runs - compress runlist into mapping pairs array
- * @attr:	attribute containing the runlist to compress
- * @rec:	destination buffer to hold the mapping pairs array
- * @offs:	current position in @rec (in/out variable)
- * @size:	size of the buffer @rec
- *
- * layout_runs walks the runlist in @attr, compresses it and writes it out the
- * resulting mapping pairs array into @rec (up to a maximum of @size bytes are
- * written). On entry @offs is the offset in @rec at which to begin writing the
- * mapping pairs array. On exit, it contains the offset in @rec of the first
- * byte after the end of the mapping pairs array.
- */
-static int layout_runs(ntfs_attribute *attr, char *rec, int *offs, int size)
-{
-	int i, len, offset, coffs;
-	/* ntfs_cluster_t MUST be signed! (AIA) */
-	ntfs_cluster_t cluster, rclus;
-	ntfs_runlist *rl = attr->d.r.runlist;
-	cluster = 0;
-	offset = *offs;
-	for (i = 0; i < attr->d.r.len; i++) {
+	/*
+	 * FIXME: Keep in mind that link_count is two for files which have both
+	 * a long file name and a short file name as separate entries, so if
+	 * we are hiding short file names this will be too high. Either we need
+	 * to account for the short file names by subtracting them or we need
+	 * to make sure we delete files even though i_nlink is not zero which
+	 * might be tricky due to vfs interactions. Need to think about this
+	 * some more when implementing the unlink command.
+	 */
+	vi->i_nlink = le16_to_cpu(m->link_count);
+	/*
+	 * FIXME: Reparse points can have the directory bit set even though
+	 * they would be S_IFLNK. Need to deal with this further below when we
+	 * implement reparse points / symbolic links but it will do for now.
+	 * Also if not a directory, it could be something else, rather than
+	 * a regular file. But again, will do for now.
+	 */
+	if (m->flags & MFT_RECORD_IS_DIRECTORY) {
+		vi->i_mode |= S_IFDIR;
 		/*
-		 * We cheat with this check on the basis that lcn will never
-		 * be less than -1 and the lcn delta will fit in signed
-		 * 32-bits (ntfs_cluster_t). (AIA)
+		 * Linux/Unix do not support directory hard links and things
+		 * break without this kludge.
 		 */
-		if (rl[i].lcn < (ntfs_cluster_t)-1) {
-			ntfs_error("layout_runs() encountered an out of bounds "
-					"cluster delta, lcn = %i.\n",
-					rl[i].lcn);
-			return -ERANGE;
-		}
-		rclus = rl[i].lcn - cluster;
-		len = rl[i].len;
-		rec[offset] = 0;
- 		if (offset + 9 > size)
-			return -E2BIG; /* It might still fit, but this
-					* simplifies testing. */
+		if (vi->i_nlink > 1)
+			vi->i_nlink = 1;
+	} else
+		vi->i_mode |= S_IFREG;
+
+	ctx = get_attr_search_ctx(ni, m);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto unm_err_out;
+	}
+
+	/*
+	 * Find the standard information attribute in the mft record. At this
+	 * stage we haven't setup the attribute list stuff yet, so this could
+	 * in fact fail if the standard information is in an extent record, but
+	 * I don't think this actually ever happens.
+	 */
+	if (!lookup_attr(AT_STANDARD_INFORMATION, NULL, 0, 0, 0, NULL, 0,
+			ctx)) {
 		/*
-		 * Run length is stored as signed number, so deal with it
-		 * properly, i.e. observe that a negative number will have all
-		 * its most significant bits set to 1 but we don't store that
-		 * in the mapping pairs array. We store the smallest type of
-		 * negative number required, thus in the first if we check
-		 * whether len fits inside a signed byte and if so we store it
-		 * as such, the next ifs check for a signed short, then a signed
-		 * 24-bit and finally the full blown signed 32-bit. Same goes
-		 * for rlus below. (AIA)
+		 * TODO: We should be performing a hot fix here (if the recover
+		 * mount option is set) by creating a new attribute.
 		 */
-		if (len >= -0x80 && len <= 0x7f) {
-			NTFS_PUTU8(rec + offset + 1, len & 0xff);
-			coffs = 1;
- 		} else if (len >= -0x8000 && len <= 0x7fff) {
-			NTFS_PUTU16(rec + offset + 1, len & 0xffff);
-			coffs = 2;
- 		} else if (len >= -0x800000 && len <= 0x7fffff) {
-			NTFS_PUTU24(rec + offset + 1, len & 0xffffff);
-			coffs = 3;
-		} else /* if (len >= -0x80000000LL && len <= 0x7fffffff */ {
-			NTFS_PUTU32(rec + offset + 1, len);
-			coffs = 4;
-		} /* else ... FIXME: When len becomes 64-bit we need to extend
-		   * 		     the else if () statements. (AIA) */
-		*(rec + offset) |= coffs++;
-		if (rl[i].lcn == (ntfs_cluster_t)-1) /* Compressed run. */
-			/* Nothing */;
-		else if (rclus >= -0x80 && rclus <= 0x7f) {
-			*(rec + offset) |= 0x10;
-			NTFS_PUTS8(rec + offset + coffs, rclus & 0xff);
-			coffs += 1;
-		} else if (rclus >= -0x8000 && rclus <= 0x7fff) {
-			*(rec + offset) |= 0x20;
-			NTFS_PUTS16(rec + offset + coffs, rclus & 0xffff);
-			coffs += 2;
-		} else if (rclus >= -0x800000 && rclus <= 0x7fffff) {
-			*(rec + offset) |= 0x30;
-			NTFS_PUTS24(rec + offset + coffs, rclus & 0xffffff);
-			coffs += 3;
-		} else /* if (rclus >= -0x80000000LL && rclus <= 0x7fffffff)*/ {
-			*(rec + offset) |= 0x40;
-			NTFS_PUTS32(rec + offset + coffs, rclus
-							/* & 0xffffffffLL */);
-			coffs += 4;
-		} /* FIXME: When rclus becomes 64-bit.
-		else if (rclus >= -0x8000000000 && rclus <= 0x7FFFFFFFFF) {
-			*(rec + offset) |= 0x50;
-			NTFS_PUTS40(rec + offset + coffs, rclus &
-							0xffffffffffLL);
-			coffs += 5;
-		} else if (rclus >= -0x800000000000 && 
-						rclus <= 0x7FFFFFFFFFFF) {
-			*(rec + offset) |= 0x60;
-			NTFS_PUTS48(rec + offset + coffs, rclus &
-							0xffffffffffffLL);
-			coffs += 6;
-		} else if (rclus >= -0x80000000000000 && 
-						rclus <= 0x7FFFFFFFFFFFFF) {
-			*(rec + offset) |= 0x70;
-			NTFS_PUTS56(rec + offset + coffs, rclus &
-							0xffffffffffffffLL);
-			coffs += 7;
-		} else {
-			*(rec + offset) |= 0x80;
-			NTFS_PUTS64(rec + offset + coffs, rclus);
-			coffs += 8;
-		} */
-		offset += coffs;
-		if (rl[i].lcn)
-			cluster = rl[i].lcn;
-	}
-	if (offset >= size)
-		return -E2BIG;
-	/* Terminating null. */
-	*(rec + offset++) = 0;
-	*offs = offset;
-	return 0;
-}
-
-static void count_runs(ntfs_attribute *attr, char *buf)
-{
-	ntfs_u32 first, count, last, i;
-	
-	first = 0;
-	for (i = 0, count = 0; i < attr->d.r.len; i++)
-		count += attr->d.r.runlist[i].len;
-	last = first + count - 1;
-	NTFS_PUTU64(buf + 0x10, first);
-	NTFS_PUTU64(buf + 0x18, last);
-} 
-
-/**
- * layout_attr - convert in memory attribute to on disk attribute record
- * @attr:	in memory attribute to convert
- * @buf:	destination buffer for on disk attribute record
- * @size:	size of the destination buffer
- * @psize:	size of converted on disk attribute record (out variable)
- *
- * layout_attr() takes the attribute @attr and converts it into the appropriate
- * on disk structure, writing it into @buf (up to @size bytes are written).
- *
- * On success we return 0 and set @*psize to the actual byte size of the on-
- * disk attribute that was written into @buf.
- */
-static int layout_attr(ntfs_attribute *attr, char *buf, int size, int *psize)
-{
-	int nameoff, hdrsize, asize;
-	
-	if (attr->resident) {
-		nameoff = 0x18;
-		hdrsize = (nameoff + 2 * attr->namelen + 7) & ~7;
-		asize = (hdrsize + attr->size + 7) & ~7;
-		if (size < asize)
-			return -E2BIG;
-		NTFS_PUTU32(buf + 0x10, attr->size);
-		NTFS_PUTU8(buf + 0x16, attr->indexed);
-		NTFS_PUTU16(buf + 0x14, hdrsize);
-		if (attr->size)
-			ntfs_memcpy(buf + hdrsize, attr->d.data, attr->size);
-	} else {
-		int error;
+		ntfs_error(vi->i_sb, "$STANDARD_INFORMATION attribute is "
+				"missing.");
+		goto put_unm_err_out;
+	}
+	/* Get the standard information attribute value. */
+	si = (STANDARD_INFORMATION*)((char*)ctx->attr +
+			le16_to_cpu(ctx->attr->_ARA(value_offset)));
 
-		if (attr->flags & ATTR_IS_COMPRESSED)
- 			nameoff = 0x48;
- 		else
- 			nameoff = 0x40;
- 		hdrsize = (nameoff + 2 * attr->namelen + 7) & ~7;
- 		if (size < hdrsize)
- 			return -E2BIG;
- 		/* Make asize point at the end of the attribute record header,
-		   i.e. at the beginning of the mapping pairs array. */
- 		asize = hdrsize;
- 		error = layout_runs(attr, buf, &asize, size);
- 		/* Now, asize points one byte beyond the end of the mapping
-		   pairs array. */
-		if (error)
- 			return error;
- 		/* The next attribute has to begin on 8-byte boundary. */
-		asize = (asize + 7) & ~7;
-		/* FIXME: fragments */
-		count_runs(attr, buf);
-		NTFS_PUTU16(buf + 0x20, hdrsize);
-		NTFS_PUTU16(buf + 0x22, attr->cengine);
-		NTFS_PUTU32(buf + 0x24, 0);
-		NTFS_PUTS64(buf + 0x28, attr->allocated);
-		NTFS_PUTS64(buf + 0x30, attr->size);
-		NTFS_PUTS64(buf + 0x38, attr->initialized);
-		if (attr->flags & ATTR_IS_COMPRESSED)
-			NTFS_PUTS64(buf + 0x40, attr->compsize);
-	}
-	NTFS_PUTU32(buf, attr->type);
-	NTFS_PUTU32(buf + 4, asize);
-	NTFS_PUTU8(buf + 8, attr->resident ? 0 : 1);
-	NTFS_PUTU8(buf + 9, attr->namelen);
-	NTFS_PUTU16(buf + 0xa, nameoff);
-	NTFS_PUTU16(buf + 0xc, attr->flags);
-	NTFS_PUTU16(buf + 0xe, attr->attrno);
-	if (attr->namelen)
-		ntfs_memcpy(buf + nameoff, attr->name, 2 * attr->namelen);
-	*psize = asize;
-	return 0;
-}
+	/* Transfer information from the standard information into vfs_ino. */
+	/*
+	 * Note: The i_?times do not quite map perfectly onto the NTFS times,
+	 * but they are close enough, and in the end it doesn't really matter
+	 * that much...
+	 */
+	/*
+	 * mtime is the last change of the data within the file. Not changed
+	 * when only metadata is changed, e.g. a rename doesn't affect mtime.
+	 */
+	vi->i_mtime = ntfs2utc(si->last_data_change_time);
+	/*
+	 * ctime is the last change of the metadata of the file. This obviously
+	 * always changes, when mtime is changed. ctime can be changed on its
+	 * own, mtime is then not changed, e.g. when a file is renamed.
+	 */
+	vi->i_ctime = ntfs2utc(si->last_mft_change_time);
+	/*
+	 * Last access to the data within the file. Not changed during a rename
+	 * for example but changed whenever the file is written to.
+	 */
+	vi->i_atime = ntfs2utc(si->last_access_time);
 
-/**
- * layout_inode - convert an in-memory inode into on disk mft record(s)
- * @ino:	in memory inode to convert
- * @store:	on disk inode, contain buffers for the on disk mft record(s)
- *
- * layout_inode takes the in memory inode @ino, converts it into a (sequence of)
- * mft record(s) and writes them to the appropriate buffers in the @store.
- *
- * Return 0 on success,
- * the required mft record count (>0) if the inode does not fit,
- * -ENOMEM if memory allocation problem, or
- * -EOPNOTSUP if beyond our capabilities.
- *
- * TODO: We at the moment do not support extension mft records. (AIA)
- */
-int layout_inode(ntfs_inode *ino, ntfs_disk_inode *store)
-{
-	int offset, i, size, psize, error, count, recno;
-	ntfs_attribute *attr;
-	unsigned char *rec;
-
-	error = allocate_store(ino->vol, store, ino->record_count);
-	if (error)
-		return error;
-	size = ino->vol->mft_record_size;
- 	count = i = 0;
- 	do {
- 		if (count < ino->record_count) {
- 			recno = ino->records[count];
- 		} else {
- 			error = allocate_store(ino->vol, store, count + 1);
- 			if (error)
- 				return error;
-	 		recno = -1;
+	/*
+	 * Find the attribute list attribute and set the corresponding bit in
+	 * ntfs_ino->state.
+	 */
+	reinit_attr_search_ctx(ctx);
+	if (lookup_attr(AT_ATTRIBUTE_LIST, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		if (vi->i_ino == FILE_MFT)
+			goto skip_attr_list_load;
+		ntfs_debug("Attribute list found in inode %li (0x%lx).",
+				vi->i_ino, vi->i_ino);
+		ni->state |= 1 << NI_AttrList;
+		if (ctx->attr->flags & ATTR_IS_ENCRYPTED ||
+				ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+			ntfs_error(vi->i_sb, "Attribute list attribute is "
+					"compressed/encrypted. Not allowed. "
+					"Corrupt inode. You should run "
+					"chkdsk.");
+			goto put_unm_err_out;
+		}
+		/* Now allocate memory for the attribute list. */
+		ni->attr_list_size = (u32)attribute_value_length(ctx->attr);
+		ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size);
+		if (!ni->attr_list) {
+			ntfs_error(vi->i_sb, "Not enough memory to allocate "
+					"buffer for attribute list.");
+			err = -ENOMEM;
+			goto ec_put_unm_err_out;
+		}
+		if (ctx->attr->non_resident) {
+			ni->state |= 1 << NI_AttrListNonResident;
+			if (ctx->attr->_ANR(lowest_vcn)) {
+				ntfs_error(vi->i_sb, "Attribute list has non "
+						"zero lowest_vcn. Inode is "
+						"corrupt. You should run "
+						"chkdsk.");
+				goto put_unm_err_out;
+			}
+			/*
+			 * Setup the run list. No need for locking as we have
+			 * exclusive access to the inode at this time.
+			 */
+			ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
+					ctx->attr, NULL);
+			if (IS_ERR(ni->attr_list_rl.rl)) {
+				err = PTR_ERR(ni->attr_list_rl.rl);
+				ni->attr_list_rl.rl = NULL;
+				ntfs_error(vi->i_sb, "Mapping pairs "
+						"decompression failed with "
+						"error code %i. Corrupt "
+						"attribute list in inode.",
+						-err);
+				goto ec_put_unm_err_out;
+			}
+			/* Now load the attribute list. */
+			if ((err = load_attribute_list(vol, &ni->attr_list_rl,
+					ni->attr_list, ni->attr_list_size,
+					sle64_to_cpu(
+					ctx->attr->_ANR(initialized_size))))) {
+				ntfs_error(vi->i_sb, "Failed to load "
+						"attribute list attribute.");
+				goto ec_put_unm_err_out;
+			}
+		} else /* if (!ctx.attr->non_resident) */ {
+			if ((u8*)ctx->attr + le16_to_cpu(
+					ctx->attr->_ARA(value_offset)) +
+					le32_to_cpu(
+					ctx->attr->_ARA(value_length)) >
+					(u8*)ctx->mrec + vol->mft_record_size) {
+				ntfs_error(vi->i_sb, "Corrupt attribute list "
+						"in inode.");
+				goto put_unm_err_out;
+			}
+			/* Now copy the attribute list. */
+			memcpy(ni->attr_list, (u8*)ctx->attr + le16_to_cpu(
+					ctx->attr->_ARA(value_offset)),
+					le32_to_cpu(
+					ctx->attr->_ARA(value_length)));
+		}
+	}
+skip_attr_list_load:
+	/*
+	 * If an attribute list is present we now have the attribute list value
+	 * in ntfs_ino->attr_list and it is ntfs_ino->attr_list_size bytes.
+	 */
+	if (S_ISDIR(vi->i_mode)) {
+		INDEX_ROOT *ir;
+		char *ir_end, *index_end;
+
+		/* It is a directory, find index root attribute. */
+		reinit_attr_search_ctx(ctx);
+		if (!lookup_attr(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0,
+				NULL, 0, ctx)) {
+			// FIXME: File is corrupt! Hot-fix with empty index
+			// root attribute if recovery option is set.
+			ntfs_error(vi->i_sb, "$INDEX_ROOT attribute is "
+					"missing.");
+			goto put_unm_err_out;
+		}
+		/* Set up the state. */
+		if (ctx->attr->non_resident) {
+			ntfs_error(vi->i_sb, "$INDEX_ROOT attribute is "
+					"not resident. Not allowed.");
+			goto put_unm_err_out;
 		}
 		/*
-		 * FIXME: We need to support extension records properly.
-		 * At the moment they wouldn't work. Probably would "just" get
-		 * corrupted if we write to them... (AIA)
+		 * Compressed/encrypted index root just means that the newly
+		 * created files in that directory should be created compressed/
+		 * encrypted. However index root cannot be both compressed and
+		 * encrypted.
 		 */
-	 	store->records[count].recno = recno;
- 		rec = store->records[count].record;
-	 	count++;
- 		/* Copy mft record header. */
-	 	offset = NTFS_GETU16(ino->attr + 0x14); /* attrs_offset */
-		ntfs_memcpy(rec, ino->attr, offset);
-	 	/* Copy attributes. */
- 		while (i < ino->attr_count) {
- 			attr = ino->attrs + i;
-	 		error = layout_attr(attr, rec + offset,
-					size - offset - 8, &psize);
-	 		if (error == -E2BIG && offset != NTFS_GETU16(ino->attr
-					+ 0x14))
- 				break;
- 			if (error)
- 				return error;
- 			offset += psize;
- 			i++;
- 		}
- 		/* Terminating attribute. */
-		NTFS_PUTU32(rec + offset, 0xFFFFFFFF);
-		offset += 4;
-		NTFS_PUTU32(rec + offset, 0);
-		offset += 4;
-		NTFS_PUTU32(rec + 0x18, offset);
-	} while (i < ino->attr_count || count < ino->record_count);
-	return count - ino->record_count;
-}
-
-/*
- * FIXME: ntfs_update_inode() calls layout_inode() to create the mft record on
- * disk structure corresponding to the inode @ino. After that, ntfs_write_attr()
- * is called to write out the created mft record to disk.
- * We shouldn't need to re-layout every single time we are updating an mft
- * record. No wonder the ntfs driver is slow like hell. (AIA)
- */
-int ntfs_update_inode(ntfs_inode *ino)
-{
-	int error, i;
-	ntfs_disk_inode store;
-	ntfs_io io;
-
-	ntfs_bzero(&store, sizeof(store));
-	error = layout_inode(ino, &store);
-	if (error == -E2BIG) {
-		i = ntfs_split_indexroot(ino);
-		if (i != -ENOTDIR) {
-			if (!i)
-				i = layout_inode(ino, &store);
-			error = i;
-		}
-	}
-	if (error == -E2BIG) {
-		error = ntfs_attr_allnonresident(ino);
-		if (!error)
-			error = layout_inode(ino, &store);
-	}
-	if (error > 0) {
-		/* FIXME: Introduce extension records. */
-		error = -E2BIG;
-	}
-	if (error) {
-		if (error == -E2BIG)
-			ntfs_error("Cannot handle saving inode 0x%x.\n",
-				   ino->i_number);
-		deallocate_store(&store);
-		return error;
-	}
-	io.fn_get = ntfs_get;
-	io.fn_put = 0;
-	for (i = 0; i < store.count; i++) {
-		error = ntfs_insert_fixups(store.records[i].record,
-				ino->vol->mft_record_size);
-		if (error) {
-			printk(KERN_ALERT "NTFS: ntfs_update_inode() caught "
-					"corrupt %s mtf record ntfs record "
-					"header. Refusing to write corrupt "
-					"data to disk. Unmount and run chkdsk "
-					"immediately!\n", i ? "extension":
-					"base");
-			deallocate_store(&store);
-			return -EIO;
+		if (ctx->attr->flags & ATTR_COMPRESSION_MASK)
+			ni->state |= 1 << NI_Compressed;
+		if (ctx->attr->flags & ATTR_IS_ENCRYPTED) {
+			if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+				ntfs_error(vi->i_sb, "Found encrypted and "
+						"compressed attribute. Not "
+						"allowed.");
+				goto put_unm_err_out;
+			}
+			ni->state |= 1 << NI_Encrypted;
 		}
-		io.param = store.records[i].record;
-		io.size = ino->vol->mft_record_size;
-		error = ntfs_write_attr(ino->vol->mft_ino, ino->vol->at_data,
-				0, (__s64)store.records[i].recno <<
-				ino->vol->mft_record_size_bits, &io);
-		if (error || io.size != ino->vol->mft_record_size) {
-			/* Big trouble, partially written file. */
-			ntfs_error("Please unmount: Write error in inode "
-					"0x%x\n", ino->i_number);
-			deallocate_store(&store);
-			return error ? error : -EIO;
+		ir = (INDEX_ROOT*)((char*)ctx->attr +
+				le16_to_cpu(ctx->attr->_ARA(value_offset)));
+		ir_end = (char*)ir + le32_to_cpu(ctx->attr->_ARA(value_length));
+		if (ir_end > (char*)ctx->mrec + vol->mft_record_size) {
+			ntfs_error(vi->i_sb, "$INDEX_ROOT attribute is "
+					"corrupt.");
+			goto put_unm_err_out;
+		}
+		index_end = (char*)&ir->index +
+				le32_to_cpu(ir->index.index_length);
+		if (index_end > ir_end) {
+			ntfs_error(vi->i_sb, "Directory index is corrupt.");
+			goto put_unm_err_out;
+		}
+		if (ir->type != AT_FILE_NAME) {
+			ntfs_error(vi->i_sb, __FUNCTION__ "(): Indexed "
+					"attribute is not $FILE_NAME. Not "
+					"allowed.");
+			goto put_unm_err_out;
+		}
+		if (ir->collation_rule != COLLATION_FILE_NAME) {
+			ntfs_error(vi->i_sb, "Index collation rule is not "
+					"COLLATION_FILE_NAME. Not allowed.");
+			goto put_unm_err_out;
+		}
+		ni->_IDM(index_block_size) = le32_to_cpu(ir->index_block_size);
+		if (ni->_IDM(index_block_size) &
+				(ni->_IDM(index_block_size) - 1)) {
+			ntfs_error(vi->i_sb, "Index block size (%u) is not a "
+					"power of two.",
+					ni->_IDM(index_block_size));
+			goto put_unm_err_out;
+		}
+		if (ni->_IDM(index_block_size) > PAGE_CACHE_SIZE) {
+			ntfs_error(vi->i_sb, "Index block size (%u) > "
+					"PAGE_CACHE_SIZE (%ld) is not "
+					"supported. Sorry.",
+					ni->_IDM(index_block_size),
+					PAGE_CACHE_SIZE);
+			err = -EOPNOTSUPP;
+			goto ec_put_unm_err_out;
+		}
+		if (ni->_IDM(index_block_size) < NTFS_BLOCK_SIZE) {
+			ntfs_error(vi->i_sb, "Index block size (%u) < "
+					"NTFS_BLOCK_SIZE (%i) is not "
+					"supported. Sorry.",
+					ni->_IDM(index_block_size),
+					NTFS_BLOCK_SIZE);
+			err = -EOPNOTSUPP;
+			goto ec_put_unm_err_out;
+		}
+		ni->_IDM(index_block_size_bits) =
+				ffs(ni->_IDM(index_block_size)) - 1;
+		/* Determine the size of a vcn in the directory index. */
+		if (vol->cluster_size <= ni->_IDM(index_block_size)) {
+			ni->_IDM(index_vcn_size) = vol->cluster_size;
+			ni->_IDM(index_vcn_size_bits) = vol->cluster_size_bits;
+		} else {
+			ni->_IDM(index_vcn_size) = vol->sector_size;
+			ni->_IDM(index_vcn_size_bits) = vol->sector_size_bits;
 		}
-	}
-	deallocate_store(&store);
-	return 0;
-}	
-
-void ntfs_decompress(unsigned char *dest, unsigned char *src, ntfs_size_t l)
-{
-	int head, comp;
-	int copied = 0;
-	unsigned char *stop;
-	int bits;
-	int tag = 0;
-	int clear_pos;
-	
-	while (1) {
-		head = NTFS_GETU16(src) & 0xFFF;
-		/* High bit indicates that compression was performed. */
-		comp = NTFS_GETU16(src) & 0x8000;
-		src += 2;
-		stop = src + head;
-		bits = 0;
-		clear_pos = 0;
-		if (head == 0)
-			/* Block is not used. */
-			return;/* FIXME: copied */
-		if (!comp) { /* uncompressible */
-			ntfs_memcpy(dest, src, 0x1000);
-			dest += 0x1000;
-			copied += 0x1000;
-			src += 0x1000;
-			if (l == copied)
-				return;
-			continue;
-		}
-		while (src <= stop) {
-			if (clear_pos > 4096) {
-				ntfs_error("Error 1 in decompress\n");
-				return;
+		if (!(ir->index.flags & LARGE_INDEX)) {
+			/* No index allocation. */
+			vi->i_size = ni->initialized_size = 0;
+			goto skip_large_dir_stuff;
+		} /* LARGE_INDEX: Index allocation present. Setup state. */
+		ni->state |= 1 << NI_NonResident;
+		/* Find index allocation attribute. */
+		reinit_attr_search_ctx(ctx);
+		if (!lookup_attr(AT_INDEX_ALLOCATION, I30, 4, CASE_SENSITIVE,
+				0, NULL, 0, ctx)) {
+			ntfs_error(vi->i_sb, "$INDEX_ALLOCATION attribute "
+					"is not present but $INDEX_ROOT "
+					"indicated it is.");
+			goto put_unm_err_out;
+		}
+		if (!ctx->attr->non_resident) {
+			ntfs_error(vi->i_sb, "$INDEX_ALLOCATION attribute "
+					"is resident.");
+			goto put_unm_err_out;
+		}
+		if (ctx->attr->flags & ATTR_IS_ENCRYPTED) {
+			ntfs_error(vi->i_sb, "$INDEX_ALLOCATION attribute "
+					"is encrypted.");
+			goto put_unm_err_out;
+		}
+		if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+			ntfs_error(vi->i_sb, "$INDEX_ALLOCATION attribute "
+					"is compressed.");
+			goto put_unm_err_out;
+		}
+		if (ctx->attr->_ANR(lowest_vcn)) {
+			ntfs_error(vi->i_sb, "First extent of "
+					"$INDEX_ALLOCATION attribute has non "
+					"zero lowest_vcn. Inode is corrupt. "
+					"You should run chkdsk.");
+			goto put_unm_err_out;
+		}
+		vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
+		ni->initialized_size = sle64_to_cpu(
+				ctx->attr->_ANR(initialized_size));
+		ni->allocated_size = sle64_to_cpu(
+				ctx->attr->_ANR(allocated_size));
+		/* Find bitmap attribute. */
+		reinit_attr_search_ctx(ctx);
+		if (!lookup_attr(AT_BITMAP, I30, 4, CASE_SENSITIVE, 0, NULL, 0,
+				ctx)) {
+			ntfs_error(vi->i_sb, "$BITMAP attribute is not "
+					"present but it must be.");
+			goto put_unm_err_out;
+		}
+		if (ctx->attr->flags & (ATTR_COMPRESSION_MASK |
+				ATTR_IS_ENCRYPTED)) {
+			ntfs_error(vi->i_sb, "$BITMAP attribute is compressed "
+					"and/or encrypted.");
+			goto put_unm_err_out;
+		}
+		if (ctx->attr->non_resident) {
+			ni->state |= 1 << NI_BmpNonResident;
+			if (ctx->attr->_ANR(lowest_vcn)) {
+				ntfs_error(vi->i_sb, "First extent of $BITMAP "
+						"attribute has non zero "
+						"lowest_vcn. Inode is corrupt. "
+						"You should run chkdsk.");
+				goto put_unm_err_out;
 			}
-			if (!bits) {
-				tag = NTFS_GETU8(src);
-				bits = 8;
-				src++;
-				if (src > stop)
-					break;
+			ni->_IDM(bmp_size) = sle64_to_cpu(
+					ctx->attr->_ANR(data_size));
+			ni->_IDM(bmp_initialized_size) = sle64_to_cpu(
+					ctx->attr->_ANR(initialized_size));
+			ni->_IDM(bmp_allocated_size) = sle64_to_cpu(
+					ctx->attr->_ANR(allocated_size));
+			/*
+			 * Setup the run list. No need for locking as we have
+			 * exclusive access to the inode at this time.
+			 */
+			ni->_IDM(bmp_rl).rl = decompress_mapping_pairs(vol,
+					ctx->attr, NULL);
+			if (IS_ERR(ni->_IDM(bmp_rl).rl)) {
+				err = PTR_ERR(ni->_IDM(bmp_rl).rl);
+				ni->_IDM(bmp_rl).rl = NULL;
+				ntfs_error(vi->i_sb, "Mapping pairs "
+						"decompression failed with "
+						"error code %i.", -err);
+				goto ec_put_unm_err_out;
 			}
-			if (tag & 1) {
-				int i, len, delta, code, lmask, dshift;
-				code = NTFS_GETU16(src);
-				src += 2;
-				if (!clear_pos) {
-					ntfs_error("Error 2 in decompress\n");
-					return;
+		} else
+			ni->_IDM(bmp_size) = ni->_IDM(bmp_initialized_size) =
+					ni->_IDM(bmp_allocated_size) =
+					le32_to_cpu(
+					ctx->attr->_ARA(value_length));
+		/* Consistency check bitmap size vs. index allocation size. */
+		if (ni->_IDM(bmp_size) << 3 < vi->i_size >>
+				ni->_IDM(index_block_size_bits)) {
+			ntfs_error(vi->i_sb, "$I30 bitmap too small (0x%Lx) "
+					"for index allocation (0x%Lx).",
+					(long long)ni->_IDM(bmp_size) << 3,
+					vi->i_size);
+			goto put_unm_err_out;
+		}
+skip_large_dir_stuff:
+		/* Everyone gets read and scan permissions. */
+		vi->i_mode |= S_IRUGO | S_IXUGO;
+		/* If not read-only, set write permissions. */
+		if (!IS_RDONLY(vi))
+			vi->i_mode |= S_IWUGO;
+		/*
+		 * Apply the directory permissions mask set in the mount
+		 * options.
+		 */
+		vi->i_mode &= ~vol->dmask;
+		/* Setup the operations for this inode. */
+		vi->i_op = &ntfs_dir_inode_ops;
+		vi->i_fop = &ntfs_dir_ops;
+		vi->i_mapping->a_ops = &ntfs_dir_aops;
+	} else {
+		/* It is a file: find first extent of unnamed data attribute. */
+		reinit_attr_search_ctx(ctx);
+		if (!lookup_attr(AT_DATA, NULL, 0, 0, 0, NULL, 0, ctx)) {
+			vi->i_size = ni->initialized_size =
+					ni->allocated_size = 0LL;
+			/*
+			 * FILE_Secure does not have an unnamed $DATA
+			 * attribute, so we special case it here.
+			 */
+			if (vi->i_ino == FILE_Secure)
+				goto no_data_attr_special_case;
+			/*
+			 * Most if not all the system files in the $Extend
+			 * system directory do not have unnamed data
+			 * attributes so we need to check if the parent
+			 * directory of the file is FILE_Extend and if it is
+			 * ignore this error. To do this we need to get the
+			 * name of this inode from the mft record as the name
+			 * contains the back reference to the parent directory.
+			 */
+			if (ntfs_is_extended_system_file(ctx) > 0)
+				goto no_data_attr_special_case;
+			// FIXME: File is corrupt! Hot-fix with empty data
+			// attribute if recovery option is set.
+			ntfs_error(vi->i_sb, "$DATA attribute is "
+					"missing.");
+			goto put_unm_err_out;
+		}
+		/* Setup the state. */
+		if (ctx->attr->non_resident) {
+			ni->state |= 1 << NI_NonResident;
+			if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+				ni->state |= 1 << NI_Compressed;
+				if (vol->cluster_size > 4096) {
+					ntfs_error(vi->i_sb, "Found "
+						"compressed data but "
+						"compression is disabled due "
+						"to cluster size (%i) > 4kiB.",
+						vol->cluster_size);
+					goto put_unm_err_out;
 				}
-				for (i = clear_pos - 1, lmask = 0xFFF,
-				     dshift = 12; i >= 0x10; i >>= 1) {
-					lmask >>= 1;
-					dshift--;
+				if ((ctx->attr->flags & ATTR_COMPRESSION_MASK)
+						!= ATTR_IS_COMPRESSED) {
+					ntfs_error(vi->i_sb, "Found "
+						"unknown compression method or "
+						"corrupt file.");
+					goto put_unm_err_out;
 				}
-				delta = code >> dshift;
-				len = (code & lmask) + 3;
-				for (i = 0; i < len; i++) {
-					dest[clear_pos] = dest[clear_pos - 
-								    delta - 1];
-					clear_pos++;
-					copied++;
-					if (copied==l)
-						return;
+				ni->_ICF(compression_block_clusters) = 1U <<
+					ctx->attr->_ANR(compression_unit);
+				if (ctx->attr->_ANR(compression_unit) != 4) {
+					ntfs_error(vi->i_sb, "Found "
+						"nonstandard compression unit "
+						"(%u instead of 4). Cannot "
+						"handle this. This might "
+						"indicate corruption so you "
+						"should run chkdsk.",
+					     ctx->attr->_ANR(compression_unit));
+					err = -EOPNOTSUPP;
+					goto ec_put_unm_err_out;
 				}
-			} else {
-				dest[clear_pos++] = NTFS_GETU8(src);
-				src++;
-				copied++;
-				if (copied==l)
-					return;
+				ni->_ICF(compression_block_size) = 1U << (
+					       ctx->attr->_ANR(compression_unit)
+						+ vol->cluster_size_bits);
+				ni->_ICF(compression_block_size_bits) = ffs(
+					ni->_ICF(compression_block_size)) - 1;
+			}
+			if (ctx->attr->flags & ATTR_IS_ENCRYPTED) {
+				if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+					ntfs_error(vi->i_sb, "Found encrypted "
+							"and compressed data.");
+					goto put_unm_err_out;
+				}
+				ni->state |= 1 << NI_Encrypted;
 			}
-			tag >>= 1;
-			bits--;
+			if (ctx->attr->_ANR(lowest_vcn)) {
+				ntfs_error(vi->i_sb, "First extent of $DATA "
+						"attribute has non zero "
+						"lowest_vcn. Inode is corrupt. "
+						"You should run chkdsk.");
+				goto put_unm_err_out;
+			}
+			/* Setup all the sizes. */
+			vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
+			ni->initialized_size = sle64_to_cpu(
+					ctx->attr->_ANR(initialized_size));
+			ni->allocated_size = sle64_to_cpu(
+					ctx->attr->_ANR(allocated_size));
+			if (NInoCompressed(ni)) {
+				ni->_ICF(compressed_size) = sle64_to_cpu(
+					ctx->attr->_ANR(compressed_size));
+				if (vi->i_size != ni->initialized_size)
+					ntfs_warning(vi->i_sb, "Compressed "
+							"file with data_size "
+							"unequal to "
+							"initialized size "
+							"found. This will "
+							"probably cause "
+							"problems when trying "
+							"to access the file. "
+							"Please notify "
+							"linux-ntfs-dev@"
+							"lists.sf.net that you"
+							"saw this message."
+							"Thanks!");
+			}
+		} else { /* Resident attribute. */
+			/*
+			 * Make all sizes equal for simplicity in read code
+			 * paths. FIXME: Need to keep this in mind when
+			 * converting to non-resident attribute in write code
+			 * path. (Probably only affects truncate().)
+			 */
+			vi->i_size = ni->initialized_size = ni->allocated_size =
+				le32_to_cpu(ctx->attr->_ARA(value_length));
 		}
-		dest += clear_pos;
+no_data_attr_special_case:
+		/* Everyone gets all permissions. */
+		vi->i_mode |= S_IRWXUGO;
+		/* If read-only, noone gets write permissions. */
+		if (IS_RDONLY(vi))
+			vi->i_mode &= ~S_IWUGO;
+		/* Apply the file permissions mask set in the mount options. */
+		vi->i_mode &= ~vol->fmask;
+		/* Setup the operations for this inode. */
+		vi->i_op = &ntfs_file_inode_ops;
+		vi->i_fop = &ntfs_file_ops;
+		vi->i_mapping->a_ops = &ntfs_file_aops;
 	}
+	/*
+	 * The number of 512-byte blocks used on disk (for stat). This is in so
+	 * far inaccurate as it doesn't account for any named streams or other
+	 * special non-resident attributes, but that is how Windows works, too,
+	 * so we are at least consistent with Windows, if not entirely
+	 * consistent with the Linux Way. Doing it the Linux Way would cause a
+	 * significant slowdown as it would involve iterating over all
+	 * attributes in the mft record and adding the allocated/compressed
+	 * sizes of all non-resident attributes present to give us the Linux
+	 * correct size that should go into i_blocks (after division by 512).
+	 */
+	if (!NInoCompressed(ni))
+		vi->i_blocks = ni->allocated_size >> 9;
+	else
+		vi->i_blocks = ni->_ICF(compressed_size) >> 9;
+	/* Done. */
+	put_attr_search_ctx(ctx);
+	unmap_mft_record(READ, ni);
+	ntfs_debug("Done.");
+	return;
+ec_put_unm_err_out:
+	put_attr_search_ctx(ctx);
+	goto ec_unm_err_out;
+put_unm_err_out:
+	put_attr_search_ctx(ctx);
+unm_err_out:
+	err = -EIO;
+ec_unm_err_out:
+	unmap_mft_record(READ, ni);
+err_out:
+	ntfs_error(vi->i_sb, "Failed with error code %i. Marking inode "
+			"%li (0x%lx) as bad.", -err, vi->i_ino, vi->i_ino);
+	make_bad_inode(vi);
+	return;
 }
 
-/*
- * NOTE: Neither of the ntfs_*_bit functions are atomic! But we don't need
- * them atomic at present as we never operate on shared/cached bitmaps.
+/**
+ * ntfs_read_inode_mount - special read_inode for mount time use only
+ * @vi:		inode to read
+ *
+ * Read inode FILE_MFT at mount time, only called with super_block lock
+ * held from within the read_super() code path.
+ *
+ * This function exists because when it is called the page cache for $MFT/$DATA
+ * is not initialized and hence we cannot get at the contents of mft records
+ * by calling map_mft_record*().
+ *
+ * Further it needs to cope with the circular references problem, i.e. can't
+ * load any attributes other than $ATTRIBUTE_LIST until $DATA is loaded, because
+ * we don't know where the other extent mft records are yet and again, because
+ * we cannot call map_mft_record*() yet. Obviously this applies only when an
+ * attribute list is actually present in $MFT inode.
+ *
+ * We solve these problems by starting with the $DATA attribute before anything
+ * else and iterating using lookup_attr($DATA) over all extents. As each extent
+ * is found, we decompress_mapping_pairs() including the implied
+ * merge_run_lists(). Each step of the iteration necessarily provides
+ * sufficient information for the next step to complete.
+ *
+ * This should work but there are two possible pit falls (see inline comments
+ * below), but only time will tell if they are real pits or just smoke...
  */
-static __inline__ int ntfs_test_bit(unsigned char *byte, const int bit)
-{
-	return byte[bit >> 3] & (1 << (bit & 7)) ? 1 : 0;
-}
-
-static __inline__ void ntfs_set_bit(unsigned char *byte, const int bit)
+void ntfs_read_inode_mount(struct inode *vi)
 {
-	byte[bit >> 3] |= 1 << (bit & 7);
-}
-
-static __inline__ void ntfs_clear_bit(unsigned char *byte, const int bit)
-{
-	byte[bit >> 3] &= ~(1 << (bit & 7));
-}
-
-static __inline__ int ntfs_test_and_clear_bit(unsigned char *byte,
-		const int bit)
-{
-	unsigned char *ptr = byte + (bit >> 3);
-	int b = 1 << (bit & 7);
-	int oldbit = *ptr & b ? 1 : 0;
-	*ptr &= ~b;
-	return oldbit;
-}
+	VCN next_vcn, last_vcn, highest_vcn;
+	s64 block;
+	struct super_block *sb = vi->i_sb;
+	ntfs_volume *vol = NTFS_SB(sb);
+	struct buffer_head *bh;
+	ntfs_inode *ni;
+	MFT_RECORD *m = NULL;
+	ATTR_RECORD *attr;
+	attr_search_context *ctx;
+	unsigned int i, nr_blocks;
+	int err;
 
-static void dump_runlist(const ntfs_runlist *rl, const int rlen)
-{
-#ifdef DEBUG
-	int i;
-	ntfs_cluster_t ct;
+	ntfs_debug("Entering.");
 
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): rlen = %i.\n", rlen);
-	ntfs_debug(DEBUG_OTHER, "VCN        LCN        Run length\n");
-	for (i = 0, ct = 0; i < rlen; ct += rl[i++].len) {
-		if (rl[i].lcn == (ntfs_cluster_t)-1)
-			ntfs_debug(DEBUG_OTHER, "0x%-8x LCN_HOLE   0x%-8x "
-					"(%s)\n", ct, rl[i].len, rl[i].len ?
-					"sparse run" : "run list end");
-		else
-			ntfs_debug(DEBUG_OTHER, "0x%-8x 0x%-8x 0x%-8x%s\n", ct,
-					rl[i].lcn, rl[i].len, rl[i].len &&
-					i + 1 < rlen ? "" : " (run list end)");
-		if (!rl[i].len)
-			break;
+	ni = ntfs_new_inode(vi->i_sb);
+	if (!ni) {
+		ntfs_error(vi->i_sb, "Failed to allocate a new inode");
+		err = ENOMEM;
+		goto err_out;
+	}
+	vi->u.generic_ip = ni;
+	ni->vfs_inode = vi;
+	ni->mft_no = vi->i_ino;
+
+	if (vi->i_ino != FILE_MFT) {
+		ntfs_error(sb, "Called for inode %ld but only inode %d "
+				"allowed.", vi->i_ino, FILE_MFT);
+		goto err_out;
 	}
-#endif
-}
 
-/**
- * splice_runlists - splice two run lists into one
- * @rl1:	pointer to address of first run list
- * @r1len:	number of elementfs in first run list
- * @rl2:	pointer to second run list
- * @r2len:	number of elements in second run list
- *
- * Append the run list @rl2 to the run list *@rl1 and return the result in
- * *@rl1 and *@r1len.
- *
- * Return 0 on success or -errno on error, in which case *@rl1 and *@r1len are
- * left untouched.
- *
- * The only possible error code at the moment is -ENOMEM and only happens if
- * there is insufficient memory to allocate the new run list (only happens
- * when size of (rl1 + rl2) > allocated size of rl1).
- */
-int splice_runlists(ntfs_runlist **rl1, int *r1len, const ntfs_runlist *rl2,
-		int r2len)
-{
-	ntfs_runlist *rl;
-	int rlen, rl_size, rl2_pos;
+	/*
+	 * This sets up our little cheat allowing us to reuse the async io
+	 * completion handler for directories.
+	 */
+	ni->_IDM(index_block_size) = vol->mft_record_size;
+	ni->_IDM(index_block_size_bits) = vol->mft_record_size_bits;
 
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Entering with *r1len = %i, "
-			"r2len = %i.\n", *r1len, r2len);
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Dumping 1st runlist.\n");
-	if (*rl1)
-		dump_runlist(*rl1, *r1len);
-	else
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Not present.\n");
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Dumping 2nd runlist.\n");
-	dump_runlist(rl2, r2len);
-	rlen = *r1len + r2len + 1;
-	rl_size = (rlen * sizeof(ntfs_runlist) + PAGE_SIZE - 1) &
-			PAGE_MASK;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): rlen = %i, rl_size = %i.\n",
-			rlen, rl_size);
-	/* Do we have enough space? */
-	if (rl_size <= ((*r1len * sizeof(ntfs_runlist) + PAGE_SIZE - 1) &
-			PAGE_MASK)) {
-		/* Have enough space already. */
-		rl = *rl1;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Have enough space "
-				"already.\n");
-	} else {
-		/* Need more space. Reallocate. */
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Need more space.\n");
-		rl = ntfs_vmalloc(rlen << sizeof(ntfs_runlist));
-		if (!rl)
-			return -ENOMEM;
-		/* Copy over rl1. */
-		ntfs_memcpy(rl, *rl1, *r1len * sizeof(ntfs_runlist));
-		ntfs_vfree(*rl1);
-		*rl1 = rl;
-	}
-	/* Reuse rl_size as the current position index into rl. */
-	rl_size = *r1len - 1;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): rl_size = %i.\n");
-	/* Coalesce neighbouring elements, if present. */
-	rl2_pos = 0;
-	if (rl[rl_size].lcn + rl[rl_size].len == rl2[rl2_pos].lcn) {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Coalescing adjacent "
-				"runs.\n");
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before: "
-				"rl[rl_size].len = %i.\n", rl[rl_size].len);
-		rl[rl_size].len += rl2[rl2_pos].len;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After: "
-				"rl[rl_size].len = %i.\n", rl[rl_size].len);
-		rl2_pos++;
-		r2len--;
-		rlen--;
-	}
-	rl_size++;
-	/* Copy over rl2. */
-	ntfs_memcpy(rl + rl_size, rl2 + rl2_pos, r2len * sizeof(ntfs_runlist));
-	rlen--;
-	rl[rlen].lcn = (ntfs_cluster_t)-1;
-	rl[rlen].len = (ntfs_cluster_t)0;
-	*r1len = rlen;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Dumping result runlist.\n");
-	dump_runlist(*rl1, *r1len);
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Returning with *r1len = "
-			"%i.\n", rlen);
-	return 0;
-}
+	/* Very important! Needed to be able to call map_mft_record*(). */
+	vol->mft_ino = vi;
 
-/**
- * ntfs_alloc_mft_record - allocate an mft record
- * @vol:	volume to allocate an mft record on
- * @result:	the mft record number allocated
- *
- * Allocate a new mft record on disk. Return 0 on success or -ERRNO on error.
- * On success, *@result contains the allocated mft record number. On error,
- * *@result is -1UL.
- *
- * Note, this function doesn't actually set the mft record to be in use. This
- * is done by the caller, which at the moment is only ntfs_alloc_inode().
- *
- * To find a free mft record, we scan the mft bitmap for a zero bit. To
- * optimize this we start scanning at the place where we last stopped and we
- * perform wrap around when we reach the end. Note, we do not try to allocate
- * mft records below number 24 because numbers 0 to 15 are the defined system
- * files anyway and 16 to 24 are special in that they are used for storing
- * extension mft records for $MFT's $DATA attribute. This is required to avoid
- * the possibility of creating a run list with a circular dependence which once
- * written to disk can never be read in again. Windows will only use records
- * 16 to 24 for normal files if the volume is completely out of space. We never
- * use them which means that when the volume is really out of space we cannot
- * create any more files while Windows can still create up to 8 small files. We
- * can start doing this at some later time, doesn't matter much for now.
- *
- * When scanning the mft bitmap, we only search up to the last allocated mft
- * record. If there are no free records left in the range 24 to number of
- * allocated mft records, then we extend the mft data in order to create free
- * mft records. We extend the allocated size of $MFT/$DATA by 16 records at a
- * time or one cluster, if cluster size is above 16kiB. If there isn't
- * sufficient space to do this, we try to extend by a single mft record or one
- * cluster, if cluster size is above mft record size, but we only do this if
- * there is enough free space, which we know from the values returned by the
- * failed cluster allocation function when we tried to do the first allocation.
- *
- * No matter how many mft records we allocate, we initialize only the first
- * allocated mft record (incrementing mft data size and initialized size) and
- * return its number to the caller in @*result, unless there are less than 24
- * mft records, in which case we allocate and initialize mft records until we
- * reach record 24 which we consider as the first free mft record for use by
- * normal files.
- *
- * If during any stage we overflow the initialized data in the mft bitmap, we
- * extend the initialized size (and data size) by 8 bytes, allocating another
- * cluster if required. The bitmap data size has to be at least equal to the
- * number of mft records in the mft, but it can be bigger, in which case the
- * superflous bits are padded with zeroes.
- *
- * Thus, when we return successfully (return value 0), we will have:
- *	- initialized / extended the mft bitmap if necessary,
- *	- initialized / extended the mft data if necessary,
- *	- set the bit corresponding to the mft record being allocated in the
- *	  mft bitmap, and we will
- *	- return the mft record number in @*result.
- *
- * On error (return value below zero), nothing will have changed. If we had
- * changed anything before the error occured, we will have reverted back to
- * the starting state before returning to the caller. Thus, except for bugs,
- * we should always leave the volume in a consitents state when returning from
- * this function. NOTE: Small exception to this is that we set the bit in the
- * mft bitmap but we do not mark the mft record in use, which is inconsistent.
- * However, the caller will immediately add the wanted attributes to the mft
- * record, set it in use and write it out to disk, so there should be no
- * problem.
- *
- * Note, this function cannot make use of most of the normal functions, like
- * for example for attribute resizing, etc, because when the run list overflows
- * the base mft record and an attribute list is used, it is very important
- * that the extension mft records used to store the $DATA attribute of $MFT
- * can be reached without having to read the information contained inside
- * them, as this would make it impossible to find them in the first place
- * after the volume is dismounted. $MFT/$BITMAP probably doesn't need to
- * follow this rule because the bitmap is not essential for finding the mft
- * records, but on the other hand, handling the bitmap in this special way
- * would make life easier because otherwise there might be circular invocations
- * of functions when reading the bitmap but if we are careful, we should be
- * able to avoid all problems.
- *
- * FIXME: Don't forget $MftMirr, though this probably belongs in
- *	  ntfs_update_inode() (or even deeper). (AIA)
- *
- * FIXME: Want finer grained locking. (AIA)
- */
-static int ntfs_alloc_mft_record(ntfs_volume *vol, unsigned long *result)
-{
-	unsigned long nr_mft_records, buf_size, buf_pos, pass_start, pass_end;
-	unsigned long last_read_pos, mft_rec_size, bit, l;
-	ntfs_attribute *data, *bmp;
-	__u8 *buf, *byte, pass, b, have_allocated_mftbmp = 0;
-	int rlen, rl_size = 0, r2len, rl2_size, old_data_rlen, err = 0;
-	ntfs_runlist *rl, *rl2;
-	ntfs_cluster_t lcn = 0, old_data_len;
-	ntfs_io io;
-	__s64 ll, old_data_allocated, old_data_initialized, old_data_size;
-
-	*result = -1UL;
-	/* Allocate a buffer and setup the io structure. */
-	buf = (__u8*)__get_free_page(GFP_NOFS);
-	if (!buf)
-		return -ENOMEM;
-	lock_kernel();
-	/* Get the $DATA and $BITMAP attributes of $MFT. */
-	data = ntfs_find_attr(vol->mft_ino, vol->at_data, 0);
-	bmp = ntfs_find_attr(vol->mft_ino, vol->at_bitmap, 0);
-	if (!data || !bmp) {
-		err = -EINVAL;
-		goto err_ret;
-	}
-	/* Determine the number of allocated mft records in the mft. */
-	pass_end = nr_mft_records = data->allocated >>
-			vol->mft_record_size_bits;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): nr_mft_records = %lu.\n",
-			nr_mft_records);
-	/* Make sure we don't overflow the bitmap. */
-	l = bmp->initialized << 3;
-	if (l < nr_mft_records)
-		// FIXME: It might be a good idea to extend the bitmap instead.
-		pass_end = l;
-	pass = 1;
-	buf_pos = vol->mft_data_pos;
-	if (buf_pos >= pass_end) {
-		buf_pos = 24UL;
-		pass = 2;
-	}
-	pass_start = buf_pos;
-	rl = bmp->d.r.runlist;
-	rlen = bmp->d.r.len - 1;
-	lcn = rl[rlen].lcn + rl[rlen].len;
-	io.fn_put = ntfs_put;
-	io.fn_get = ntfs_get;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Starting bitmap search.\n");
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): pass = %i, pass_start = %lu, "
-			"pass_end = %lu.\n", pass, pass_start, pass_end);
-	byte = NULL; // FIXME: For debugging only.
-	/* Loop until a free mft record is found. */
-	io.size = (nr_mft_records >> 3) & ~PAGE_MASK;
-	for (;; io.size = PAGE_SIZE) {
-		io.param = buf;
-		io.do_read = 1;
-		last_read_pos = buf_pos >> 3;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		err = ntfs_readwrite_attr(vol->mft_ino, bmp, last_read_pos,
-				&io);
-		if (err)
-			goto err_ret;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Read %lu bytes.\n",
-				(unsigned long)io.size);
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		if (!io.size)
-			goto pass_done;
-		buf_size = io.size << 3;
-		bit = buf_pos & 7UL;
-		buf_pos &= ~7UL;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before loop: "
-				"buf_size = %lu, buf_pos = %lu, bit = %lu, "
-				"*byte = 0x%x, b = %u.\n",
-				buf_size, buf_pos, bit, byte ? *byte : -1, b);
-		for (; bit < buf_size && bit + buf_pos < pass_end;
-				bit &= ~7UL, bit += 8UL) {
-			byte = buf + (bit >> 3);
-			if (*byte == 0xff)
+	/* Allocate enough memory to read the first mft record. */
+	if (vol->mft_record_size > 64 * 1024) {
+		ntfs_error(sb, "Unsupported mft record size %i (max 64kiB).",
+				vol->mft_record_size);
+		goto err_out;
+	}
+	i = vol->mft_record_size;
+	if (i < sb->s_blocksize)
+		i = sb->s_blocksize;
+	m = (MFT_RECORD*)ntfs_malloc_nofs(i);
+	if (!m) {
+		ntfs_error(sb, "Failed to allocate buffer for $MFT record 0.");
+		goto err_out;
+	}
+
+	/* Determine the first block of the $MFT/$DATA attribute. */
+	block = vol->mft_lcn << vol->cluster_size_bits >>
+			sb->s_blocksize_bits;
+	nr_blocks = vol->mft_record_size >> sb->s_blocksize_bits;
+	if (!nr_blocks)
+		nr_blocks = 1;
+
+	/* Load $MFT/$DATA's first mft record. */
+	for (i = 0; i < nr_blocks; i++) {
+		bh = sb_bread(sb, block++);
+		if (!bh) {
+			ntfs_error(sb, "Device read failed.");
+			goto err_out;
+		}
+		memcpy((char*)m + (i << sb->s_blocksize_bits), bh->b_data,
+				sb->s_blocksize);
+		brelse(bh);
+	}
+
+	/* Apply the mst fixups. */
+	if (post_read_mst_fixup((NTFS_RECORD*)m, vol->mft_record_size)) {
+		/* FIXME: Try to use the $MFTMirr now. */
+		ntfs_error(sb, "MST fixup failed. $MFT is corrupt.");
+		goto err_out;
+	}
+
+	/* Need this to sanity check attribute list references to $MFT. */
+	ni->seq_no = le16_to_cpu(m->sequence_number);
+
+	/* Provides readpage() and sync_page() for map_mft_record(READ). */
+	vi->i_mapping->a_ops = &ntfs_mft_aops;
+
+	ctx = get_attr_search_ctx(ni, m);
+	if (!ctx) {
+		err = -ENOMEM;
+		goto err_out;
+	}
+
+	/* Find the attribute list attribute if present. */
+	if (lookup_attr(AT_ATTRIBUTE_LIST, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		ATTR_LIST_ENTRY *al_entry, *next_al_entry;
+		u8 *al_end;
+
+		ntfs_debug("Attribute list attribute found in $MFT.");
+		ni->state |= 1 << NI_AttrList;
+		if (ctx->attr->flags & ATTR_IS_ENCRYPTED ||
+				ctx->attr->flags & ATTR_COMPRESSION_MASK) {
+			ntfs_error(sb, "Attribute list attribute is "
+					"compressed/encrypted. Not allowed. "
+					"$MFT is corrupt. You should run "
+					"chkdsk.");
+			goto put_err_out;
+		}
+		/* Now allocate memory for the attribute list. */
+		ni->attr_list_size = (u32)attribute_value_length(ctx->attr);
+		ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size);
+		if (!ni->attr_list) {
+			ntfs_error(sb, "Not enough memory to allocate buffer "
+					"for attribute list.");
+			goto put_err_out;
+		}
+		if (ctx->attr->non_resident) {
+			ni->state |= 1 << NI_AttrListNonResident;
+			if (ctx->attr->_ANR(lowest_vcn)) {
+				ntfs_error(sb, "Attribute list has non zero "
+						"lowest_vcn. $MFT is corrupt. "
+						"You should run chkdsk.");
+				goto put_err_out;
+			}
+			/* Setup the run list. */
+			ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
+					ctx->attr, NULL);
+			if (IS_ERR(ni->attr_list_rl.rl)) {
+				err = PTR_ERR(ni->attr_list_rl.rl);
+				ni->attr_list_rl.rl = NULL;
+				ntfs_error(sb, "Mapping pairs decompression "
+						"failed with error code %i.",
+						-err);
+				goto put_err_out;
+			}
+			/* Now load the attribute list. */
+			if ((err = load_attribute_list(vol, &ni->attr_list_rl,
+					ni->attr_list, ni->attr_list_size,
+					sle64_to_cpu(
+					ctx->attr->_ANR(initialized_size))))) {
+				ntfs_error(sb, "Failed to load attribute list "
+						"attribute with error code %i.",
+						-err);
+				goto put_err_out;
+			}
+		} else /* if (!ctx.attr->non_resident) */ {
+			if ((u8*)ctx->attr + le16_to_cpu(
+					ctx->attr->_ARA(value_offset)) +
+					le32_to_cpu(
+					ctx->attr->_ARA(value_length)) >
+					(u8*)ctx->mrec + vol->mft_record_size) {
+				ntfs_error(sb, "Corrupt attribute list "
+						"attribute.");
+				goto put_err_out;
+			}
+			/* Now copy the attribute list. */
+			memcpy(ni->attr_list, (u8*)ctx->attr + le16_to_cpu(
+					ctx->attr->_ARA(value_offset)),
+					le32_to_cpu(
+					ctx->attr->_ARA(value_length)));
+		}
+		/* The attribute list is now setup in memory. */
+		/*
+		 * FIXME: I don't know if this case is actually possible.
+		 * According to logic it is not possible but I have seen too
+		 * many weird things in MS software to rely on logic... Thus we
+		 * perform a manual search and make sure the first $MFT/$DATA
+		 * extent is in the base inode. If it is not we abort with an
+		 * error and if we ever see a report of this error we will need
+		 * to do some magic in order to have the necessary mft record
+		 * loaded and in the right place in the page cache. But
+		 * hopefully logic will prevail and this never happens...
+		 */
+		al_entry = (ATTR_LIST_ENTRY*)ni->attr_list;
+		al_end = (u8*)al_entry + ni->attr_list_size;
+		for (;; al_entry = next_al_entry) {
+			/* Out of bounds check. */
+			if ((u8*)al_entry < ni->attr_list ||
+					(u8*)al_entry > al_end)
+				goto em_put_err_out;
+			/* Catch the end of the attribute list. */
+			if ((u8*)al_entry == al_end)
+				goto em_put_err_out;
+			if (!al_entry->length)
+				goto em_put_err_out;
+			if ((u8*)al_entry + 6 > al_end || (u8*)al_entry +
+					le16_to_cpu(al_entry->length) > al_end)
+				goto em_put_err_out;
+			next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +
+					le16_to_cpu(al_entry->length));
+			if (le32_to_cpu(al_entry->type) >
+					const_le32_to_cpu(AT_DATA))
+				goto em_put_err_out;
+			if (AT_DATA != al_entry->type)
 				continue;
-			b = ffz((unsigned long)*byte);
-			if (b < (__u8)8 && b >= (bit & 7UL)) {
-				bit = b + (bit & ~7UL) + buf_pos;
-				ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): "
-						"Found free rec in for loop. "
-						"bit = %lu\n", bit);
-				goto found_free_rec;
+			/* We want an unnamed attribute. */
+			if (al_entry->name_length)
+				goto em_put_err_out;
+			/* Want the first entry, i.e. lowest_vcn == 0. */
+			if (al_entry->lowest_vcn)
+				goto em_put_err_out;
+			/* First entry has to be in the base mft record. */
+			if (MREF_LE(al_entry->mft_reference) != ni->mft_no) {
+				/* MFT references do not match, logic fails. */
+				ntfs_error(sb, "BUG: The first $DATA extent "
+						"of $MFT is not in the base "
+						"mft record. Please report "
+						"you saw this message to "
+						"linux-ntfs-dev@lists.sf.net");
+				goto put_err_out;
+			} else {
+				/* Sequence numbers must match. */
+				if (MSEQNO_LE(al_entry->mft_reference) !=
+						ni->seq_no)
+					goto em_put_err_out;
+				/* Got it. All is ok. We can stop now. */
+				break;
 			}
 		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After loop: "
-				"buf_size = %lu, buf_pos = %lu, bit = %lu, "
-				"*byte = 0x%x, b = %u.\n",
-				buf_size, buf_pos, bit, byte ? *byte : -1, b);
-		buf_pos += buf_size;
-		if (buf_pos < pass_end)
-			continue;
-pass_done:	/* Finished with the current pass. */
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At pass_done.\n");
-		if (pass == 1) {
+	}
+
+	reinit_attr_search_ctx(ctx);
+
+	/* Now load all attribute extents. */
+	attr = NULL;
+	next_vcn = last_vcn = highest_vcn = 0;
+	while (lookup_attr(AT_DATA, NULL, 0, 0, next_vcn, NULL, 0, ctx)) {
+		run_list_element *nrl;
+
+		/* Cache the current attribute. */
+		attr = ctx->attr;
+		/* $MFT must be non-resident. */
+		if (!attr->non_resident) {
+			ntfs_error(sb, "$MFT must be non-resident but a "
+					"resident extent was found. $MFT is "
+					"corrupt. Run chkdsk.");
+			goto put_err_out;
+		}
+		/* $MFT must be uncompressed and unencrypted. */
+		if (attr->flags & ATTR_COMPRESSION_MASK ||
+				attr->flags & ATTR_IS_ENCRYPTED) {
+			ntfs_error(sb, "$MFT must be uncompressed and "
+					"unencrypted but a compressed/"
+					"encrypted extent was found. "
+					"$MFT is corrupt. Run chkdsk.");
+			goto put_err_out;
+		}
+		/*
+		 * Decompress the mapping pairs array of this extent and merge
+		 * the result into the existing run list. No need for locking
+		 * as we have exclusive access to the inode at this time and we
+		 * are a mount in progress task, too.
+		 */
+		nrl = decompress_mapping_pairs(vol, attr, ni->run_list.rl);
+		if (IS_ERR(nrl)) {
+			ntfs_error(sb, "decompress_mapping_pairs() failed with "
+					"error code %ld. $MFT is corrupt.",
+					PTR_ERR(nrl));
+			goto put_err_out;
+		}
+		ni->run_list.rl = nrl;
+
+		/* Are we in the first extent? */
+		if (!next_vcn) {
+			if (attr->_ANR(lowest_vcn)) {
+				ntfs_error(sb, "First extent of $DATA "
+						"attribute has non zero "
+						"lowest_vcn. $MFT is corrupt. "
+						"You should run chkdsk.");
+				goto put_err_out;
+			}
+			/* Get the last vcn in the $DATA attribute. */
+			last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
+					vol->cluster_size_bits;
+			/* Fill in the inode size. */
+			vi->i_size = sle64_to_cpu(attr->_ANR(data_size));
+			ni->initialized_size = sle64_to_cpu(
+					attr->_ANR(initialized_size));
+			ni->allocated_size = sle64_to_cpu(
+					attr->_ANR(allocated_size));
+			/* Set the number of mft records. */
+			vol->_VMM(nr_mft_records) = vi->i_size >>
+					vol->mft_record_size_bits;
 			/*
-			 * Now do pass 2, scanning the first part of the zone
-			 * we omitted in pass 1.
+			 * We have got the first extent of the run_list for
+			 * $MFT which means it is now relatively safe to call
+			 * the normal ntfs_read_inode() function. Thus, take
+			 * us out of the calling chain. Also we need to do this
+			 * now because we need ntfs_read_inode() in place to
+			 * get at subsequent extents.
 			 */
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Done pass "
-					"1.\n");
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Pass = 2.\n");
-			pass = 2;
-			pass_end = pass_start;
-			buf_pos = pass_start = 24UL;
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): pass = %i, "
-					"pass_start = %lu, pass_end = %lu.\n",
-					pass, pass_start, pass_end);
-			continue;
-		} /* pass == 2 */
-		/* No free records left. */
-		if (bmp->initialized << 3 > nr_mft_records &&
-				bmp->initialized > 3) {
+			sb->s_op = &ntfs_sops;
 			/*
-			 * The mft bitmap is already bigger but the space is
-			 * not covered by mft records, this implies that the
-			 * next records are all free, so we already have found
-			 * a free record.
+			 * Complete reading the inode, this will actually
+			 * re-read the mft record for $MFT, this time entering
+			 * it into the page cache with which we complete the
+			 * kick start of the volume. It should be safe to do
+			 * this now as the first extent of $MFT/$DATA is
+			 * already known and we would hope that we don't need
+			 * further extents in order to find the other
+			 * attributes belonging to $MFT. Only time will tell if
+			 * this is really the case. If not we will have to play
+			 * magic at this point, possibly duplicating a lot of
+			 * ntfs_read_inode() at this point. We will need to
+			 * ensure we do enough of its work to be able to call
+			 * ntfs_read_inode() on extents of $MFT/$DATA. But lets
+			 * hope this never happens...
 			 */
-			bit = nr_mft_records;
-			if (bit < 24UL)
-				bit = 24UL;
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Found free "
-					"record bit (#1) = 0x%lx.\n", bit);
-			goto found_free_rec;
-		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Done pass 2.\n");
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		/* Need to extend the mft bitmap. */
-		if (bmp->initialized + 8LL > bmp->allocated) {
-			ntfs_io io2;
-
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Initialized "
-					"> allocated.\n");
-			/* Need to extend bitmap by one more cluster. */
-			rl = bmp->d.r.runlist;
-			rlen = bmp->d.r.len - 1;
-			lcn = rl[rlen].lcn + rl[rlen].len;
-			io2.fn_put = ntfs_put;
-			io2.fn_get = ntfs_get;
-			io2.param = &b;
-			io2.size = 1;
-			io2.do_read = 1;
-			err = ntfs_readwrite_attr(vol->bitmap, data, lcn >> 3,
-					&io2);
-			if (err)
-				goto err_ret;
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Read %lu "
-					"bytes.\n", (unsigned long)io2.size);
-			if (io2.size == 1 && b != 0xff) {
-				__u8 tb = 1 << (lcn & (ntfs_cluster_t)7);
-				if (!(b & tb)) {
-					/* Next cluster is free. Allocate it. */
-					b |= tb;
-					io2.param = &b;
-					io2.do_read = 0;
-					err = ntfs_readwrite_attr(vol->bitmap,
-							data, lcn >> 3, &io2);
-					if (err || io.size != 1) {
-						if (!err)
-							err = -EIO;
-						goto err_ret;
-					}
-append_mftbmp_simple:			rl[rlen].len++;
-					have_allocated_mftbmp |= 1;
-					ntfs_debug(DEBUG_OTHER, __FUNCTION__
-							"(): Appending one "
-							"cluster to mftbmp.\n");
-				}
-			}
-			if (!have_allocated_mftbmp) {
-				/* Allocate a cluster from the DATA_ZONE. */
-				ntfs_cluster_t lcn2 = lcn;
-				ntfs_cluster_t count = 1;
-				err = ntfs_allocate_clusters(vol, &lcn2,
-						&count, &rl2, &r2len,
-						DATA_ZONE);
-				if (err)
-					goto err_ret;
-				if (count != 1 || lcn2 <= 0) {
-					if (count > 0) {
-rl2_dealloc_err_out:				if (ntfs_deallocate_clusters(
-							vol, rl2, r2len))
-							ntfs_error(__FUNCTION__
-							"(): Cluster "
-							"deallocation in error "
-							"code path failed! You "
-							"should run chkdsk.\n");
-					}
-					ntfs_vfree(rl2);
-					if (!err)
-						err = -EINVAL;
-					goto err_ret;
-				}
-				if (lcn2 == lcn) {
-					ntfs_vfree(rl2);
-					goto append_mftbmp_simple;
-				}
-				/* We need to append a new run. */
-				rl_size = (rlen * sizeof(ntfs_runlist) +
-						PAGE_SIZE - 1) & PAGE_MASK;
-				/* Reallocate memory if necessary. */
-				if ((rlen + 2) * sizeof(ntfs_runlist) >=
-						rl_size) {
-					ntfs_runlist *rlt;
-
-					rl_size += PAGE_SIZE;
-					rlt = ntfs_vmalloc(rl_size);
-					if (!rlt) {
-						err = -ENOMEM;
-						goto rl2_dealloc_err_out;
-					}
-					ntfs_memcpy(rlt, rl, rl_size -
-							PAGE_SIZE);
-					ntfs_vfree(rl);
-					bmp->d.r.runlist = rl = rlt;
-				}
-				ntfs_vfree(rl2);
-				rl[rlen].lcn = lcn = lcn2;
-				rl[rlen].len = count;
-				bmp->d.r.len = ++rlen;
-				have_allocated_mftbmp |= 2;
-				ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): "
-						"Adding run to mftbmp. "
-						"LCN = %i, len = %i\n", lcn,
-						count);
+			ntfs_read_inode(vi);
+			if (is_bad_inode(vi)) {
+				ntfs_error(sb, "ntfs_read_inode() of $MFT "
+						"failed. BUG or corrupt $MFT. "
+						"Run chkdsk and if no errors "
+						"are found, please report you "
+						"saw this message to "
+						"linux-ntfs-dev@lists.sf.net");
+				put_attr_search_ctx(ctx);
+				/* Revert to the safe super operations. */
+				sb->s_op = &ntfs_mount_sops;
+				goto out_now;
 			}
 			/*
-			 * We now have extended the mft bitmap allocated size
-			 * by one cluster. Reflect this in the attribute.
+			 * Re-initialize some specifics about $MFT's inode as
+			 * ntfs_read_inode() will have set up the default ones.
 			 */
-			bmp->allocated += (__s64)vol->cluster_size;
-		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		/* We now have sufficient allocated space. */
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Now have sufficient "
-				"allocated space in mftbmp.\n");
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		buf_pos = bmp->initialized;
-		bmp->initialized += 8LL;
-		if (bmp->initialized > bmp->size)
-			bmp->size = bmp->initialized;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		have_allocated_mftbmp |= 4;
-		/* Update the mft bitmap attribute value. */
-		memset(buf, 0, 8);
-		io.param = buf;
-		io.size = 8;
-		io.do_read = 0;
-		err = ntfs_readwrite_attr(vol->mft_ino, bmp, buf_pos, &io);
-		if (err || io.size != 8) {
-			if (!err)
-				err = -EIO;
-			goto shrink_mftbmp_err_ret;
-		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Wrote extended "
-				"mftbmp bytes %lu.\n", (unsigned long)io.size);
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After write: "
-				"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-				"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-				bmp->size, bmp->initialized);
-		bit = buf_pos << 3;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Found free record "
-				"bit (#2) = 0x%lx.\n", bit);
-		goto found_free_rec;
-	}
-found_free_rec:
-	/* bit is the found free mft record. Allocate it in the mft bitmap. */
-	vol->mft_data_pos = bit;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At found_free_rec.\n");
-	io.param = buf;
-	io.size = 1;
-	io.do_read = 1;
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Before update: "
-			"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-			"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-			bmp->size, bmp->initialized);
-	err = ntfs_readwrite_attr(vol->mft_ino, bmp, bit >> 3, &io);
-	if (err || io.size != 1) {
-		if (!err)
-			err = -EIO;
-		goto shrink_mftbmp_err_ret;
-	}
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Read %lu bytes.\n",
-			(unsigned long)io.size);
-#ifdef DEBUG
-	/* Check our bit is really zero! */
-	if (*buf & (1 << (bit & 7)))
-		BUG();
-#endif
-	*buf |= 1 << (bit & 7);
-	io.param = buf;
-	io.do_read = 0;
-	err = ntfs_readwrite_attr(vol->mft_ino, bmp, bit >> 3, &io);
-	if (err || io.size != 1) {
-		if (!err)
-			err = -EIO;
-		goto shrink_mftbmp_err_ret;
-	}
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Wrote %lu bytes.\n",
-			(unsigned long)io.size);
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After update: "
-			"bmp->allocated = 0x%Lx, bmp->size = 0x%Lx, "
-			"bmp->initialized = 0x%Lx.\n", bmp->allocated,
-			bmp->size, bmp->initialized);
-	/* The mft bitmap is now uptodate. Deal with mft data attribute now. */
-	ll = (__s64)(bit + 1) << vol->mft_record_size_bits;
-	if (ll <= data->initialized) {
-		/* The allocated record is already initialized. We are done! */
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Allocated mft record "
-				"already initialized!\n");
-		goto done_ret;
-	}
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Allocated mft record needs "
-			"to be initialized.\n");
-	/* The mft record is outside the initialized data. */
-	mft_rec_size = (unsigned long)vol->mft_record_size;
-	/* Preserve old values for undo purposes. */
-	old_data_allocated = data->allocated;
-	old_data_rlen = data->d.r.len - 1;
-	old_data_len = data->d.r.runlist[old_data_rlen].len;
-	/*
-	 * If necessary, extend the mft until it covers the allocated record.
-	 * The loop is only actually used when a freshly formatted volume is
-	 * first written to. But it optimizes away nicely in the common case.
-	 */
-	while (ll > data->allocated) {
-		ntfs_cluster_t lcn2, nr_lcn2, nr, min_nr;
+			/* Set uid and gid to root. */
+			vi->i_uid = vi->i_gid = 0;
+			/* Regular file. No access for anyone. */
+			vi->i_mode = S_IFREG;
+			/* No VFS initiated operations allowed for $MFT. */
+			vi->i_op = &ntfs_empty_inode_ops;
+			vi->i_fop = &ntfs_empty_file_ops;
+			/* Put back our special address space operations. */
+			vi->i_mapping->a_ops = &ntfs_mft_aops;
+		}
+
+		/* Get the lowest vcn for the next extent. */
+		highest_vcn = sle64_to_cpu(attr->_ANR(highest_vcn));
+		next_vcn = highest_vcn + 1;
 
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Extending mft "
-				"data allocation, data->allocated = 0x%Lx, "
-				"data->size = 0x%Lx, data->initialized = "
-				"0x%Lx.\n", data->allocated, data->size,
-				data->initialized);
-		/* Minimum allocation is one mft record worth of clusters. */
-		if (mft_rec_size <= vol->cluster_size)
-			min_nr = (ntfs_cluster_t)1;
-		else
-			min_nr = mft_rec_size >> vol->cluster_size_bits;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): min_nr = %i.\n",
-				min_nr);
-		/* Allocate 16 mft records worth of clusters. */
-		nr = mft_rec_size << 4 >> vol->cluster_size_bits;
-		if (!nr)
-			nr = (ntfs_cluster_t)1;
-		/* Determine the preferred allocation location. */
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): nr = %i.\n", nr);
-		rl2 = data->d.r.runlist;
-		r2len = data->d.r.len;
-		lcn2 = rl2[r2len - 1].lcn + rl2[r2len - 1].len;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): rl2[r2len - 1].lcn "
-				"= %i, .len = %i.\n", rl2[r2len - 1].lcn,
-				rl2[r2len - 1].len);
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): lcn2 = %i, r2len = "
-				"%i.\n", lcn2, r2len);
-retry_mft_data_allocation:
-		nr_lcn2 = nr;
-		err = ntfs_allocate_clusters(vol, &lcn2, &nr_lcn2, &rl2,
-				&r2len, MFT_ZONE);
-#ifdef DEBUG
-		if (!err && nr_lcn2 < min_nr)
-			/* Allocated less than minimum needed. Weird! */
-			BUG();
-#endif
-		if (err) {
-			/*
-			 * If there isn't enough space to do the wanted
-			 * allocation, but there is enough space to do a
-			 * minimal allocation, then try that, unless the wanted
-			 * allocation was already the minimal allocation.
-			 */
-			if (err == -ENOSPC && nr > min_nr &&
-					nr_lcn2 >= min_nr) {
-				nr = min_nr;
-				ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): "
-						"Retrying mft data "
-						"allocation, nr = min_nr = %i"
-						".\n", nr);
-				goto retry_mft_data_allocation;
-			}
-			goto undo_mftbmp_alloc_err_ret;
-		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Allocated %i "
-				"clusters starting at LCN %i.\n", nr_lcn2,
-				lcn2);
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Allocated "
-				"runlist:\n");
-		dump_runlist(rl2, r2len);
-		/* Append rl2 to the mft data attribute's run list. */
-		err = splice_runlists(&data->d.r.runlist, (int*)&data->d.r.len,
-				rl2, r2len);
-		if (err) {
-			ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): "
-					"splice_runlists failed with error "
-					"code %i.\n", -err);
-			goto undo_partial_data_alloc_err_ret;
-		}
-		/* Reflect the allocated clusters in the mft allocated data. */
-		data->allocated += nr_lcn2 << vol->cluster_size_bits;
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After extending mft "
-				"data allocation, data->allocated = 0x%Lx, "
-				"data->size = 0x%Lx, data->initialized = "
-				"0x%Lx.\n", data->allocated, data->size,
-				data->initialized);
-	}
-	/* Prepare a formatted (empty) mft record. */
-	memset(buf, 0, mft_rec_size);
-	ntfs_fill_mft_header(buf, mft_rec_size, 0, 0, 0);
-	err = ntfs_insert_fixups(buf, mft_rec_size);
-	if (err)
-		goto undo_data_alloc_err_ret;
-	/*
-	 * Extend mft data initialized size to reach the allocated mft record
-	 * and write the formatted mft record buffer to each mft record being
-	 * initialized. Note, that ntfs_readwrite_attr extends both
-	 * data->initialized and data->size, so no need for us to touch them.
-	 */
-	old_data_initialized = data->initialized;
-	old_data_size = data->size;
-	while (ll > data->initialized) {
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Initializing mft "
-				"record 0x%Lx.\n",
-				data->initialized >> vol->mft_record_size_bits);
-		io.param = buf;
-		io.size = mft_rec_size;
-		io.do_read = 0;
-		err = ntfs_readwrite_attr(vol->mft_ino, data,
-				data->initialized, &io);
-		if (err || io.size != mft_rec_size) {
-			if (!err)
-				err = -EIO;
-			goto undo_data_init_err_ret;
-		}
-		ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Wrote %i bytes to "
-				"mft data.\n", io.size);
-	}
-	/* Update the VFS inode size as well. */
-	VFS_I(vol->mft_ino)->i_size = data->size;
-#ifdef DEBUG
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): After mft record "
-			"initialization: data->allocated = 0x%Lx, data->size "
-			"= 0x%Lx, data->initialized = 0x%Lx.\n",
-			data->allocated, data->size, data->initialized);
-	/* Sanity checks. */
-	if (data->size > data->allocated || data->size < data->initialized ||
-			data->initialized > data->allocated)
-		BUG();
-#endif
-done_ret:
-	/* Return the number of the allocated mft record. */
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At done_ret. *result = bit = "
-			"0x%lx.\n", bit);
-	*result = bit;
-	vol->mft_data_pos = bit + 1;
-err_ret:
-	unlock_kernel();
-	free_page((unsigned long)buf);
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): Syncing inode $MFT.\n");
-	if (ntfs_update_inode(vol->mft_ino))
-		ntfs_error(__FUNCTION__ "(): Failed to sync inode $MFT. "
-				"Continuing anyway.\n");
-	if (!err) {
-		ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): Done. Allocated mft "
-				"record number *result = 0x%lx.\n", *result);
-		return 0;
-	}
-	if (err != -ENOSPC)
-		ntfs_error(__FUNCTION__ "(): Failed to allocate an mft "
-				"record. Returning error code %i.\n", -err);
-	else
-		ntfs_debug(DEBUG_FILE3, __FUNCTION__ "(): Failed to allocate "
-				"an mft record due to lack of free space.\n");
-	return err;
-undo_data_init_err_ret:
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At "
-			"undo_data_init_err_ret.\n");
-	data->initialized = old_data_initialized;
-	data->size = old_data_size;
-undo_data_alloc_err_ret:
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At undo_data_alloc_err_ret."
-			"\n");
-	data->allocated = old_data_allocated;
-undo_partial_data_alloc_err_ret:
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At "
-			"undo_partial_data_alloc_err_ret.\n");
-	/* Deallocate the clusters. */
-	if (ntfs_deallocate_clusters(vol, rl2, r2len))
-		ntfs_error(__FUNCTION__ "(): Error deallocating clusters in "
-				"error code path. You should run chkdsk.\n");
-	ntfs_vfree(rl2);
-	/* Revert the run list back to what it was before. */
-	r2len = data->d.r.len;
-	rl2 = data->d.r.runlist;
-	rl2[old_data_rlen++].len = old_data_len;
-	rl2[old_data_rlen].lcn = (ntfs_cluster_t)-1;
-	rl2[old_data_rlen].len = (ntfs_cluster_t)0;
-	data->d.r.len = old_data_rlen;
-	rl2_size = ((old_data_rlen + 1) * sizeof(ntfs_runlist) + PAGE_SIZE -
-			1) & PAGE_MASK;
-	/* Reallocate memory freeing any extra memory allocated. */
-	if (rl2_size < ((r2len * sizeof(ntfs_runlist) + PAGE_SIZE - 1) &
-			PAGE_MASK)) {
-		rl2 = ntfs_vmalloc(rl2_size);
-		if (rl2) {
-			ntfs_memcpy(rl2, data->d.r.runlist, rl2_size);
-			ntfs_vfree(data->d.r.runlist);
-			data->d.r.runlist = rl2;
-		} else
-			ntfs_error(__FUNCTION__ "(): Error reallocating "
-					"memory in error code path. This "
-					"should be harmless.\n");
-	}	
-undo_mftbmp_alloc_err_ret:
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At "
-			"undo_mftbmp_alloc_err_ret.\n");
-	/* Deallocate the allocated bit in the mft bitmap. */
-	io.param = buf;
-	io.size = 1;
-	io.do_read = 1;
-	err = ntfs_readwrite_attr(vol->mft_ino, bmp, bit >> 3, &io);
-	if (!err && io.size == 1) {
-		*buf &= ~(1 << (bit & 7));
-		io.param = buf;
-		io.do_read = 0;
-		err = ntfs_readwrite_attr(vol->mft_ino, bmp, bit >> 3, &io);
-	}
-	if (err || io.size != 1) {
-		if (!err)
-			err = -EIO;
-		ntfs_error(__FUNCTION__ "(): Error deallocating mft record in "
-				"error code path. You should run chkdsk.\n");
-	}
-shrink_mftbmp_err_ret:
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): At shrink_mftbmp_err_ret.\n");
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): have_allocated_mftbmp = "
-			"%i.\n", have_allocated_mftbmp);
-	if (!have_allocated_mftbmp)
-		goto err_ret;
-	/* Shrink the mftbmp back to previous size. */
-	if (bmp->size == bmp->initialized)
-		bmp->size -= 8LL;
-	bmp->initialized -= 8LL;
-	have_allocated_mftbmp &= ~4;
-	/* If no allocation occured then we are done. */
-	ntfs_debug(DEBUG_OTHER, __FUNCTION__ "(): have_allocated_mftbmp = "
-			"%i.\n", have_allocated_mftbmp);
-	if (!have_allocated_mftbmp)
-		goto err_ret;
-	/* Deallocate the allocated cluster. */
-	bmp->allocated -= (__s64)vol->cluster_size;
-	if (ntfs_deallocate_cluster_run(vol, lcn, (ntfs_cluster_t)1))
-		ntfs_error(__FUNCTION__ "(): Error deallocating cluster in "
-				"error code path. You should run chkdsk.\n");
-	switch (have_allocated_mftbmp & 3) {
-	case 1:
-		/* Delete the last lcn from the last run of mftbmp. */
-		rl[rlen - 1].len--;
-		break;
-	case 2:
-		/* Delete the last run of mftbmp. */
-		bmp->d.r.len = --rlen;
-		/* Reallocate memory if necessary. */
-		if ((rlen + 1) * sizeof(ntfs_runlist) <= rl_size - PAGE_SIZE) {
-			ntfs_runlist *rlt;
-
-			rl_size -= PAGE_SIZE;
-			rlt = ntfs_vmalloc(rl_size);
-			if (rlt) {
-				ntfs_memcpy(rlt, rl, rl_size);
-				ntfs_vfree(rl);
-				bmp->d.r.runlist = rl = rlt;
-			} else
-				ntfs_error(__FUNCTION__ "(): Error "
-						"reallocating memory in error "
-						"code path. This should be "
-						"harmless.\n");
+		/* Only one extent or error, which we catch below. */
+		if (next_vcn <= 0)
+			break;
+
+		/* Avoid endless loops due to corruption. */
+		if (next_vcn < sle64_to_cpu(attr->_ANR(lowest_vcn))) {
+			ntfs_error(sb, "$MFT has corrupt attribute list "
+					"attribute. Run chkdsk.");
+			goto put_err_out;
 		}
-		bmp->d.r.runlist[bmp->d.r.len].lcn = (ntfs_cluster_t)-1;
-		bmp->d.r.runlist[bmp->d.r.len].len = (ntfs_cluster_t)0;
-		break;
-	default:
-		BUG();
 	}
-	goto err_ret;
+	if (!attr) {
+		ntfs_error(sb, "$MFT/$DATA attribute not found. $MFT is "
+				"corrupt. Run chkdsk.");
+		goto put_err_out;
+	}
+	if (highest_vcn && highest_vcn != last_vcn - 1) {
+		ntfs_error(sb, "Failed to load the complete run list "
+				"for $MFT/$DATA. Driver bug or "
+				"corrupt $MFT. Run chkdsk.");
+		ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx",
+				(long long)highest_vcn,
+				(long long)last_vcn - 1);
+		goto put_err_out;
+	}
+	put_attr_search_ctx(ctx);
+	ntfs_debug("Done.");
+out_now:
+	ntfs_free(m);
+	return;
+em_put_err_out:
+	ntfs_error(sb, "Couldn't find first extent of $DATA attribute in "
+			"attribute list. $MFT is corrupt. Run chkdsk.");
+put_err_out:
+	put_attr_search_ctx(ctx);
+err_out:
+	/* Make sure we revert to the safe super operations. */
+	sb->s_op = &ntfs_mount_sops;
+	ntfs_error(sb, "Failed. Marking inode as bad.");
+	make_bad_inode(vi);
+	goto out_now;
 }
 
-/* We need 0x48 bytes in total. */
-static int add_standard_information(ntfs_inode *ino)
+/**
+ * ntfs_dirty_inode - mark the inode's metadata dirty
+ * @vi:		inode to mark dirty
+ *
+ * This is called from fs/inode.c::__mark_inode_dirty(), when the inode itself
+ * is being marked dirty. An example is when UPDATE_ATIME() is invoked.
+ *
+ * We mark the inode dirty by setting both the page in which the mft record
+ * resides and the buffer heads in that page which correspond to the mft record
+ * dirty. This ensures that the changes will eventually be propagated to disk
+ * when the inode is set dirty.
+ *
+ * FIXME: Can we do that with the buffer heads? I am not too sure. Because if we
+ * do that we need to make sure that the kernel will not write out those buffer
+ * heads or we are screwed as it will write corrupt data to disk. The only way
+ * a mft record can be written correctly is by mst protecting it, writting it
+ * synchronously and fast mst deprotecting it. During this period, obviously,
+ * the mft record must be marked as not uptodate, be locked for writing or
+ * whatever, so that nobody attempts anything stupid.
+ *
+ * FIXME: Do we need to check that the fs is not mounted read only? And what
+ * about the inode? Anything else?
+ *
+ * FIXME: As we are only a read only driver it is safe to just return here for
+ * the moment.
+ */
+void ntfs_dirty_inode(struct inode *vi)
 {
-	ntfs_time64_t now;
-	char data[0x30];
-	char *position = data;
-	ntfs_attribute *si;
-
-	now = ntfs_now();
-	NTFS_PUTU64(position + 0x00, now);		/* File creation */
-	NTFS_PUTU64(position + 0x08, now);		/* Last modification */
-	NTFS_PUTU64(position + 0x10, now);		/* Last mod for MFT */
-	NTFS_PUTU64(position + 0x18, now);		/* Last access */
-	NTFS_PUTU64(position + 0x20, 0);		/* MSDOS file perms */
-	NTFS_PUTU64(position + 0x28, 0);		/* unknown */
-	return ntfs_create_attr(ino, ino->vol->at_standard_information, 0,
-			data, sizeof(data), &si);
+	ntfs_debug("Entering for inode 0x%lx.", vi->i_ino);
+	NInoSetDirty(NTFS_I(vi));
+	return;
 }
 
-static int add_filename(ntfs_inode *ino, ntfs_inode *dir, 
-		const unsigned char *filename, int length, ntfs_u32 flags)
+/**
+ * ntfs_commit_inode - write out a dirty inode
+ * @ni:		inode to write out
+ *
+ */
+int ntfs_commit_inode(ntfs_inode *ni)
 {
-	unsigned char *position;
-	unsigned int size;
-	ntfs_time64_t now;
-	int count, error;
-	unsigned char* data;
-	ntfs_attribute *fn;
-
-	/* Work out the size. */
-	size = 0x42 + 2 * length;
-	data = ntfs_malloc(size);
-	if (!data)
-		return -ENOMEM;
-	/* Search for a position. */
-	position = data;
-	NTFS_PUTINUM(position, dir);			/* Inode num of dir */
-	now = ntfs_now();
-	NTFS_PUTU64(position + 0x08, now);		/* File creation */
-	NTFS_PUTU64(position + 0x10, now);		/* Last modification */
-	NTFS_PUTU64(position + 0x18, now);		/* Last mod for MFT */
-	NTFS_PUTU64(position + 0x20, now);		/* Last access */
-	/* FIXME: Get the following two sizes by finding the data attribute
-	 * in ino->attr and copying the corresponding fields from there.
-	 * If no data present then set to zero. In current implementation
-	 * add_data is called after add_filename so zero is correct on
-	 * creation. Need to change when we have hard links / support different
-	 * filename namespaces. (AIA) */
-	NTFS_PUTS64(position + 0x28, 0);		/* Allocated size */
-	NTFS_PUTS64(position + 0x30, 0);		/* Data size */
-	NTFS_PUTU32(position + 0x38, flags);		/* File flags */
-	NTFS_PUTU32(position + 0x3c, 0);		/* We don't use these
-							 * features yet. */
-	NTFS_PUTU8(position + 0x40, length);		/* Filename length */
-	NTFS_PUTU8(position + 0x41, 0);			/* Only long name */
-		/* FIXME: This is madness. We are defining the POSIX namespace
-		 * for the filename here which can mean that the file will be
-		 * invisible when in Windows NT/2k! )-: (AIA) */
-	position += 0x42;
-	for (count = 0; count < length; count++) {
-		NTFS_PUTU16(position + 2 * count, filename[count]);
-	}
-	error = ntfs_create_attr(ino, ino->vol->at_file_name, 0, data, size,
-				 &fn);
-	if (!error)
-		error = ntfs_dir_add(dir, ino, fn);
-	ntfs_free(data);
-	return error;
+	ntfs_debug("Entering for inode 0x%Lx.",
+			(unsigned long long)ni->mft_no);
+	NInoClearDirty(ni);
+	return 0;
 }
 
-int add_security(ntfs_inode* ino, ntfs_inode* dir)
+void __ntfs_clear_inode(ntfs_inode *ni)
 {
-	int error;
-	char *buf;
-	int size;
-	ntfs_attribute* attr;
-	ntfs_io io;
-	ntfs_attribute *se;
-
-	attr = ntfs_find_attr(dir, ino->vol->at_security_descriptor, 0);
-	if (!attr)
-		return -EOPNOTSUPP; /* Need security in directory. */
-	size = attr->size;
-	if (size > 512)
-		return -EOPNOTSUPP;
-	buf = ntfs_malloc(size);
-	if (!buf)
-		return -ENOMEM;
-	io.fn_get = ntfs_get;
-	io.fn_put = ntfs_put;
-	io.param = buf;
-	io.size = size;
-	error = ntfs_read_attr(dir, ino->vol->at_security_descriptor, 0, 0,&io);
-	if (!error && io.size != size)
-		ntfs_error("wrong size in add_security\n");
-	if (error) {
-		ntfs_free(buf);
-		return error;
-	}
-	/* FIXME: Consider ACL inheritance. */
-	error = ntfs_create_attr(ino, ino->vol->at_security_descriptor,
-				 0, buf, size, &se);
-	ntfs_free(buf);
-	return error;
+	int err;
+
+	ntfs_debug("Entering for inode 0x%Lx.",
+			(unsigned long long)ni->mft_no);
+	if (NInoDirty(ni)) {
+		err = ntfs_commit_inode(ni);
+		if (err) {
+			ntfs_error(ni->vol->sb, "Failed to commit dirty "
+					"inode synchronously.");
+			// FIXME: Do something!!!
+		}
+	}
+	/* Synchronize with ntfs_commit_inode(). */
+	down_write(&ni->mrec_lock);
+	up_write(&ni->mrec_lock);
+	if (NInoDirty(ni)) {
+		ntfs_error(ni->vol->sb, "Failed to commit dirty inode "
+				"asynchronously.");
+		// FIXME: Do something!!!
+	}
+	/* No need to lock at this stage as no one else has a reference. */
+	if (ni->nr_extents > 0) {
+		int i;
+
+		// FIXME: Handle dirty case for each extent inode!
+		for (i = 0; i < ni->nr_extents; i++)
+			ntfs_destroy_inode(ni->_INE(extent_ntfs_inos)[i]);
+		kfree(ni->_INE(extent_ntfs_inos));
+	}
+	/* Free all alocated memory. */
+	down_write(&ni->run_list.lock);
+	ntfs_free(ni->run_list.rl);
+	ni->run_list.rl = NULL;
+	up_write(&ni->run_list.lock);
+
+	if (ni->attr_list) {
+		ntfs_free(ni->attr_list);
+
+		down_write(&ni->attr_list_rl.lock);
+		ntfs_free(ni->attr_list_rl.rl);
+		ni->attr_list_rl.rl = NULL;
+		up_write(&ni->attr_list_rl.lock);
+	}
 }
 
-static int add_data(ntfs_inode* ino, unsigned char *data, int length)
+void ntfs_clear_inode(ntfs_inode *ni)
 {
-	ntfs_attribute *da;
-	
-	return ntfs_create_attr(ino, ino->vol->at_data, 0, data, length, &da);
+	__ntfs_clear_inode(ni);
+
+	/* Bye, bye... */
+	ntfs_destroy_inode(ni);
 }
 
-/*
- * We _could_ use 'dir' to help optimise inode allocation.
+/**
+ * ntfs_clear_big_inode - clean up the ntfs specific part of an inode
+ * @vi:         vfs inode pending annihilation
+ *
+ * When the VFS is going to remove an inode from memory, ntfs_clear_big_inode()
+ * is called, which deallocates all memory belonging to the NTFS specific part
+ * of the inode and returns.
  *
- * FIXME: Need to undo what we do in ntfs_alloc_mft_record if we get an error
- * further on in ntfs_alloc_inode. Either fold the two functions to allow
- * proper undo or just deallocate the record from the mft bitmap. (AIA)
+ * If the MFT record is dirty, we commit it before doing anything else.
  */
-int ntfs_alloc_inode(ntfs_inode *dir, ntfs_inode *result, const char *filename,
-		int namelen, ntfs_u32 flags)
+void ntfs_clear_big_inode(struct inode *vi)
 {
-	ntfs_volume *vol = dir->vol;
-	int err;
-	ntfs_u8 buffer[2];
-	ntfs_io io;
+	ntfs_inode *ni = NTFS_I(vi);
+
+	__ntfs_clear_inode(ni);
 
-	err = ntfs_alloc_mft_record(vol, &(result->i_number));
-	if (err) {
-		if (err == -ENOSPC)
-			ntfs_error(__FUNCTION__ "(): No free inodes.\n");
-		return err;
-	}
-	/* Get the sequence number. */
-	io.fn_put = ntfs_put;
-	io.fn_get = ntfs_get;
-	io.param = buffer;
-	io.size = 2;
-	err = ntfs_read_attr(vol->mft_ino, vol->at_data, 0, 
-			((__s64)result->i_number << vol->mft_record_size_bits)
-			+ 0x10, &io);
-	// FIXME: We are leaving the MFT in inconsistent state! (AIA)
-	if (err)
-		return err;
-	/* Increment the sequence number skipping zero. */
-	result->sequence_number = (NTFS_GETU16(buffer) + 1) & 0xffff;
-	if (!result->sequence_number)
-		result->sequence_number++;
-	result->vol = vol;
-	result->attr_count = 0;
-	result->attrs = 0;
-	result->record_count = 1;
-	result->records = ntfs_calloc(8 * sizeof(int));
-	if (!result->records)
-		goto mem_err_out;
-	result->records[0] = result->i_number;
-	result->attr = ntfs_calloc(vol->mft_record_size);
-	if (!result->attr) {
-		ntfs_free(result->records);
-		result->records = NULL;
-		goto mem_err_out;
-	}
-	ntfs_fill_mft_header(result->attr, vol->mft_record_size,
-			result->sequence_number, 1, 1);
-	err = add_standard_information(result);
-	if (!err)
-		err = add_filename(result, dir, filename, namelen, flags);
-	if (!err)
-		err = add_security(result, dir);
-	// FIXME: We are leaving the MFT in inconsistent state on error! (AIA)
-	return err;
-mem_err_out:
-	// FIXME: We are leaving the MFT in inconsistent state! (AIA)
-	result->record_count = 0;
-	result->attr = NULL;
-	return -ENOMEM;
+	if (S_ISDIR(vi->i_mode)) {
+		down_write(&ni->_IDM(bmp_rl).lock);
+		ntfs_free(ni->_IDM(bmp_rl).rl);
+		up_write(&ni->_IDM(bmp_rl).lock);
+	}
+	ntfs_destroy_inode(ni);
+	return;
 }
 
-int ntfs_alloc_file(ntfs_inode *dir, ntfs_inode *result, char *filename,
-		int namelen)
+static const option_t si_readdir_opts_arr[] = {
+	{ SHOW_SYSTEM,	"system" },
+	{ SHOW_WIN32,	"win32" },
+	{ SHOW_DOS,	"dos" },
+	{ 0,		NULL }
+};
+
+/**
+ * ntfs_show_options - show mount options in /proc/mounts
+ * @sf:		seq_file in which to write our mount options
+ * @mnt:	vfs mount whose mount options to display
+ *
+ * Called by the VFS once for each mounted ntfs volume when someone reads
+ * /proc/mounts in order to display the NTFS specific mount options of each
+ * mount. The mount options of the vfs mount @mnt are written to the seq file
+ * @sf and success is returned.
+ */
+int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt)
 {
-	int err;
+	ntfs_volume *vol = NTFS_SB(mnt->mnt_sb);
+	int i;
 
-	err = ntfs_alloc_inode(dir, result, filename, namelen, 0);
-	if (!err)
-		err = add_data(result, 0, 0);
-	return err;
+	seq_printf(sf, ",uid=%i", vol->uid);
+	seq_printf(sf, ",gid=%i", vol->gid);
+	if (vol->fmask == vol->dmask)
+		seq_printf(sf, ",umask=0%o", vol->fmask);
+	else {
+		seq_printf(sf, ",fmask=0%o", vol->fmask);
+		seq_printf(sf, ",dmask=0%o", vol->dmask);
+	}
+	seq_printf(sf, ",nls=%s", vol->nls_map->charset);
+	switch (vol->readdir_opts) {
+	case SHOW_ALL:
+		seq_printf(sf, ",show_inodes=all");
+		break;
+	case SHOW_POSIX:
+		seq_printf(sf, ",show_inodes=posix");
+		break;
+	default:
+		for (i = 0; si_readdir_opts_arr[i].val; i++) {
+			if (si_readdir_opts_arr[i].val & vol->readdir_opts)
+				seq_printf(sf, ",show_inodes=%s",
+						si_readdir_opts_arr[i].str);
+		}
+	}
+	for (i = 0; on_errors_arr[i].val; i++) {
+		if (on_errors_arr[i].val & vol->on_errors)
+			seq_printf(sf, ",errors=%s", on_errors_arr[i].str);
+	}
+	seq_printf(sf, ",mft_zone_multiplier=%i", vol->mft_zone_multiplier);
+	return 0;
 }
 
diff -Nur linux/fs/ntfs/inode.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/inode.h
--- linux/fs/ntfs/inode.h	Sat Sep  8 21:24:40 2001
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/inode.h	Mon May  6 23:16:24 2002
@@ -1,58 +1,153 @@
 /*
- * inode.h -  Header file for inode.c
+ * inode.h - Defines for inode structures NTFS Linux kernel driver. Part of
+ *	     the Linux-NTFS project.
  *
- * Copyright (C) 1997 Régis Duchesne
- * Copyright (C) 1998 Martin von Löwis
- * Copyright (c) 2001 Anton Altparmakov (AIA)
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-ntfs_attribute *ntfs_find_attr(ntfs_inode *ino, int type, char *name);
-
-int ntfs_read_attr(ntfs_inode *ino, int type, char *name, __s64 offset,
-		ntfs_io *buf);
-
-int ntfs_write_attr(ntfs_inode *ino, int type, char *name, __s64 offset,
-		ntfs_io *buf);
+#ifndef _LINUX_NTFS_INODE_H
+#define _LINUX_NTFS_INODE_H
 
-int ntfs_init_inode(ntfs_inode *ino, ntfs_volume *vol, int inum);
+#include <linux/seq_file.h>
 
-void ntfs_clear_inode(ntfs_inode *ino);
+#include "volume.h"
 
-int ntfs_check_mft_record(ntfs_volume *vol, char *record);
+typedef struct _ntfs_inode ntfs_inode;
 
-int ntfs_alloc_inode(ntfs_inode *dir, ntfs_inode *result, const char *filename,
-		int namelen, ntfs_u32);
-
-int ntfs_alloc_file(ntfs_inode *dir, ntfs_inode *result, char *filename,
-		int namelen);
-
-int ntfs_update_inode(ntfs_inode *ino);
+/*
+ * The NTFS in-memory inode structure. It is just used as an extension to the
+ * fields already provided in the VFS inode.
+ */
+struct _ntfs_inode {
+	struct inode *vfs_inode;
+	s64 initialized_size;	/* Copy from $DATA/$INDEX_ALLOCATION. */
+	s64 allocated_size;	/* Copy from $DATA/$INDEX_ALLOCATION. */
+	unsigned long state;	/* NTFS specific flags describing this inode.
+				   See fs/ntfs/ntfs.h:ntfs_inode_state_bits. */
+	u64 mft_no;		/* Mft record number (inode number). */
+	u16 seq_no;		/* Sequence number of the mft record. */
+	atomic_t count;		/* Inode reference count for book keeping. */
+	ntfs_volume *vol;	/* Pointer to the ntfs volume of this inode. */
+	run_list run_list;	/* If state has the NI_NonResident bit set,
+				   the run list of the unnamed data attribute
+				   (if a file) or of the index allocation
+				   attribute (directory). If run_list.rl is
+				   NULL, the run list has not been read in or
+				   has been unmapped. If NI_NonResident is
+				   clear, the unnamed data attribute is
+				   resident (file) or there is no $I30 index
+				   allocation attribute (directory). In that
+				   case run_list.rl is always NULL.*/
+	struct rw_semaphore mrec_lock;	/* Lock for serializing access to the
+				   mft record belonging to this inode. */
+	atomic_t mft_count;	/* Mapping reference count for book keeping. */
+	struct page *page;	/* The page containing the mft record of the
+				   inode. This should only be touched by the
+				   (un)map_mft_record*() functions. */
+	int page_ofs;		/* Offset into the page at which the mft record
+				   begins. This should only be touched by the
+				   (un)map_mft_record*() functions. */
+	/*
+	 * Attribute list support (only for use by the attribute lookup
+	 * functions). Setup during read_inode for all inodes with attribute
+	 * lists. Only valid if NI_AttrList is set in state, and attr_list_rl is
+	 * further only valid if NI_AttrListNonResident is set.
+	 */
+	u32 attr_list_size;	/* Length of attribute list value in bytes. */
+	u8 *attr_list;		/* Attribute list value itself. */
+	run_list attr_list_rl;	/* Run list for the attribute list value. */
+	union {
+		struct { /* It is a directory or $MFT. */
+			u32 index_block_size;	/* Size of an index block. */
+			u8 index_block_size_bits; /* Log2 of the above. */
+			u32 index_vcn_size;	/* Size of a vcn in this
+						   directory index. */
+			u8 index_vcn_size_bits;	/* Log2 of the above. */
+			s64 bmp_size;		/* Size of the $I30 bitmap. */
+			s64 bmp_initialized_size; /* Copy from $I30 bitmap. */
+			s64 bmp_allocated_size;	/* Copy from $I30 bitmap. */
+			run_list bmp_rl;	/* Run list for the $I30 bitmap
+						   if it is non-resident. */
+		} SN(idm);
+		struct { /* It is a compressed file. */
+			u32 compression_block_size;     /* Size of a compression
+						           block (cb). */
+			u8 compression_block_size_bits; /* Log2 of the size of
+							   a cb. */
+			u8 compression_block_clusters;  /* Number of clusters
+							   per compression
+							   block. */
+			s64 compressed_size;		/* Copy from $DATA. */
+		} SN(icf);
+	} SN(idc);
+	struct semaphore extent_lock;	/* Lock for accessing/modifying the
+					   below . */
+	s32 nr_extents;	/* For a base mft record, the number of attached extent
+			   inodes (0 if none), for extent records this is -1. */
+	union {		/* This union is only used if nr_extents != 0. */
+		ntfs_inode **extent_ntfs_inos;	/* For nr_extents > 0, array of
+						   the ntfs inodes of the extent
+						   mft records belonging to
+						   this base inode which have
+						   been loaded. */
+		ntfs_inode *base_ntfs_ino;	/* For nr_extents == -1, the
+						   ntfs inode of the base mft
+						   record. */
+	} SN(ine);
+};
+
+#define _IDM(X)  SC(idc.idm,X)
+#define _ICF(X)  SC(idc.icf,X)
+#define _INE(X)  SC(ine,X)
+
+typedef struct {
+	ntfs_inode ntfs_inode;
+	struct inode vfs_inode;		/* The vfs inode structure. */
+} big_ntfs_inode;
+
+/**
+ * NTFS_I - return the ntfs inode given a vfs inode
+ * @inode:	VFS inode
+ *
+ * NTFS_I() returns the ntfs inode associated with the VFS @inode.
+ */
+static inline ntfs_inode *NTFS_I(struct inode *inode)
+{
+	return (ntfs_inode *)inode->u.generic_ip;
+}
 
-int ntfs_vcn_to_lcn(ntfs_inode *ino, int vcn);
+static inline struct inode *VFS_I(ntfs_inode *ni)
+{
+	return ni->vfs_inode;
+}
 
-int ntfs_readwrite_attr(ntfs_inode *ino, ntfs_attribute *attr, __s64 offset,
-		ntfs_io *dest);
+extern void ntfs_clear_big_inode(struct inode *vi);
 
-int ntfs_allocate_attr_number(ntfs_inode *ino, int *result);
+extern ntfs_inode *ntfs_new_inode(struct super_block *sb);
+extern void ntfs_clear_inode(ntfs_inode *ni);
 
-int ntfs_decompress_run(unsigned char **data, int *length,
-		ntfs_cluster_t *cluster, int *ctype);
+extern void ntfs_read_inode(struct inode *vi);
+extern void ntfs_read_inode_mount(struct inode *vi);
 
-void ntfs_decompress(unsigned char *dest, unsigned char *src, ntfs_size_t l);
+extern void ntfs_dirty_inode(struct inode *vi);
 
-int splice_runlists(ntfs_runlist **rl1, int *r1len, const ntfs_runlist *rl2,
-		int r2len);
+extern int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt);
 
-/*
- * NOTE: Neither of the ntfs_*_bit functions are atomic! But we don't need
- * them atomic at present as we never operate on shared/cached bitmaps.
- */
-static __inline__ int ntfs_test_and_set_bit(unsigned char *byte, const int bit)
-{
-	unsigned char *ptr = byte + (bit >> 3);
-	int b = 1 << (bit & 7);
-	int oldbit = *ptr & b ? 1 : 0;
-	*ptr |= b;
-	return oldbit;
-}
+#endif /* _LINUX_NTFS_FS_INODE_H */
 
diff -Nur linux/fs/ntfs/kcompat.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/kcompat.h
--- linux/fs/ntfs/kcompat.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/kcompat.h	Mon May  6 23:16:24 2002
@@ -0,0 +1,63 @@
+/*
+ * kcompat.h - Various defines needed to easier sync with the 2.5.x version.
+ *	       Part of the Linux-NTFS project. Ported from the misc part of
+ *	       the 2.5.x kernel.
+ *
+ * Copyright (c) 2002 Pawel Kot.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LINUX_NTFS_KCOMPAT_H
+#define _LINUX_NTFS_KCOMPAT_H
+
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+
+#include <linux/compiler.h>
+
+#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+
+/* Page cache limit. The filesystems should put that into their s_maxbytes
+   limits, otherwise bad things can happen in VM. */
+#if BITS_PER_LONG==32
+#  define MAX_LFS_FILESIZE        (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1)
+#elif BITS_PER_LONG==64
+#  define MAX_LFS_FILESIZE        0x7fffffffffffffff
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19))
+/* Copied from 2.5.x: fs/block_dev.c. This function was introduced with
+   2.4.19-pre8 kernel version. If you use some post pre7 version but earlier
+   then 2.4.19 release you will want to remove these -- pkot */
+static inline int sb_set_blocksize(struct super_block *sb, int size)
+{
+	int bits;
+	if (set_blocksize(sb->s_dev, size) < 0)
+		return 0;
+	sb->s_blocksize = size;
+	for (bits = 9, size >>= 9; size >>= 1; bits++)
+		;
+	sb->s_blocksize_bits = bits;
+	return sb->s_blocksize;
+}
+
+#endif /* Linux 2.4.18 and older */
+
+#endif /* Linux 2.4.x */
+
+#endif /* _LINUX_NTFS_KCOMPAT_H */
diff -Nur linux/fs/ntfs/layout.h linux-2.4.18-ntfs-2.0.6a/fs/ntfs/layout.h
--- linux/fs/ntfs/layout.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.18-ntfs-2.0.6a/fs/ntfs/layout.h	Mon May  6 23:16:24 2002
@@ -0,0 +1,2229 @@
+/*
+ * layout.h - All NTFS associated on-disk structures. Part of the Linux-NTFS
+ *	      project.
+ *
+ * Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be 
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS 
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LINUX_NTFS_LAYOUT_H
+#define _LINUX_NTFS_LAYOUT_H
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/list.h>
+#include <asm/byteorder.h>
+
+#include "volume.h"
+
+/*
+ * Constant endianness conversion defines.
+ */
+#define const_le16_to_cpu(x)	__constant_le16_to_cpu(x)
+#define const_le32_to_cpu(x)	__constant_le32_to_cpu(x)
+#define const_le64_to_cpu(x)	__constant_le64_to_cpu(x)
+
+#define const_cpu_to_le16(x)	__constant_cpu_to_le16(x)
+#define const_cpu_to_le32(x)	__constant_cpu_to_le32(x)
+#define const_cpu_to_le64(x)	__constant_cpu_to_le64(x)
+
+/* The NTFS oem_id */
+#define magicNTFS	const_cpu_to_le64(0x202020205346544e) /* "NTFS    " */
+
+/*
+ * Location of bootsector on partition:
+ * 	The standard NTFS_BOOT_SECTOR is on sector 0 of the partition.
+ * 	On NT4 and above there is one backup copy of the boot sector to
+ * 	be found on the last sector of the partition (not normally accessible
+ * 	from within Windows as the bootsector contained number of sectors
+ *	value is one less than the actual value!).
+ * 	On versions of NT 3.51 and earlier, the backup copy was located at 
+ * 	number of sectors/2 (integer divide), i.e. in the middle of the volume.
+ */
+
+/*
+ * BIOS parameter block (bpb) structure.
+ */
+typedef struct {
+	u16 bytes_per_sector;		/* Size of a sector in bytes. */
+	u8  sectors_per_cluster;	/* Size of a cluster in sectors. */
+	u16 reserved_sectors;		/* zero */
+	u8  fats;			/* zero */
+	u16 root_entries;		/* zero */
+	u16 sectors;			/* zero */
+	u8  media_type;			/* 0xf8 = hard disk */
+	u16 sectors_per_fat;		/* zero */
+	u16 sectors_per_track;		/* irrelevant */
+	u16 heads;			/* irrelevant */
+	u32 hidden_sectors;		/* zero */
+	u32 large_sectors;		/* zero */
+} __attribute__ ((__packed__)) BIOS_PARAMETER_BLOCK;
+
+/*
+ * NTFS boot sector structure.
+ */
+typedef struct {
+	u8  jump[3];			/* Irrelevant (jump to boot up code).*/
+	u64 oem_id;			/* Magic "NTFS    ". */
+	BIOS_PARAMETER_BLOCK bpb;	/* See BIOS_PARAMETER_BLOCK. */
+	u8  unused[4];			/* zero, NTFS diskedit.exe states that
+					   this is actually:
+						__u8 physical_drive;	// 0x80
+						__u8 current_head;	// zero
+						__u8 extended_boot_signature;
+									// 0x80
+						__u8 unused;		// zero
+					 */
+/*0x28*/s64 number_of_sectors;		/* Number of sectors in volume. Gives
+					   maximum volume size of 2^63 sectors.
+					   Assuming standard sector size of 512
+					   bytes, the maximum byte size is
+					   approx. 4.7x10^21 bytes. (-; */
+	s64 mft_lcn;			/* Cluster location of mft data. */
+	s64 mftmirr_lcn;		/* Cluster location of copy of mft. */
+	s8  clusters_per_mft_record;	/* Mft record size in clusters. */
+	u8  reserved0[3];		/* zero */
+	s8  clusters_per_index_record;	/* Index block size in clusters. */
+	u8  reserved1[3];		/* zero */
+	u64 volume_serial_number;	/* Irrelevant (serial number). */
+	u32 checksum;			/* Boot sector checksum. */
+/*0x54*/u8  bootstrap[426];		/* Irrelevant (boot up code). */
+	u16 end_of_sector_marker;	/* End of bootsector magic. Always is
+					   0xaa55 in little endian. */
+/* sizeof() = 512 (0x200) bytes */
+} __attribute__ ((__packed__)) NTFS_BOOT_SECTOR;
+
+/*
+ * Magic identifiers present at the beginning of all ntfs record containing
+ * records (like mft records for example).
+ */
+typedef enum {
+	magic_BAAD = const_cpu_to_le32(0x44414142), /* BAAD == corrupt record */
+	magic_CHKD = const_cpu_to_le32(0x424b4843), /* CHKD == chkdsk ??? */
+        magic_FILE = const_cpu_to_le32(0x454c4946), /* FILE == mft entry */
+	magic_HOLE = const_cpu_to_le32(0x454c4f48), /* HOLE == ? (NTFS 3.0+?) */
+        magic_INDX = const_cpu_to_le32(0x58444e49), /* INDX == index buffer */
+} NTFS_RECORD_TYPES;
+
+/*
+ * Generic magic comparison macros. Finally found a use for the ## preprocessor
+ * operator! (-8
+ */
+#define is_magic(x, m)		(   (u32)(x) == magic_##m )
+#define is_magicp(p, m) 	( *(u32*)(p) == magic_##m )
+
+/*
+ * Specialised magic comparison macros.
+ */
+#define is_baad_record(x)	( is_magic (x, BAAD) )
+#define is_baad_recordp(p)	( is_magicp(p, BAAD) )
+#define is_chkd_record(x)       ( is_magic (x, CHKD) )
+#define is_chkd_recordp(p)      ( is_magicp(p, CHKD) )
+#define is_file_record(x)	( is_magic (x, FILE) )
+#define is_file_recordp(p)	( is_magicp(p, FILE) )
+#define is_hole_record(x)       ( is_magic (x, HOLE) )
+#define is_hole_recordp(p)      ( is_magicp(p, HOLE) )
+#define is_indx_record(x)       ( is_magic (x, INDX) )
+#define is_indx_recordp(p)      ( is_magicp(p, INDX) )
+
+#define is_mft_record(x)	( is_file_record(x) )
+#define is_mft_recordp(p)	( is_file_recordp(p) )
+
+/*
+ * The Update Sequence Array (usa) is an array of the u16 values which belong
+ * to the end of each sector protected by the update sequence record in which
+ * this array is contained. Note that the first entry is the Update Sequence
+ * Number (usn), a cyclic counter of how many times the protected record has
+ * been written to disk. The values 0 and -1 (ie. 0xffff) are not used. All
+ * last u16's of each sector have to be equal to the usn (during reading) or
+ * are set to it (during writing). If they are not, an incomplete multi sector
+ * transfer has occured when the data was written.
+ * The maximum size for the update sequence array is fixed to:
+ * 	maximum size = usa_ofs + (usa_count * 2) = 510 bytes
+ * The 510 bytes comes from the fact that the last u16 in the array has to
+ * (obviously) finish before the last u16 of the first 512-byte sector.
+ * This formula can be used as a consistency check in that usa_ofs +
+ * (usa_count * 2) has to be less than or equal to 510.
+ */
+typedef struct {
+	NTFS_RECORD_TYPES magic;	/* A four-byte magic identifying the
+					   record type and/or status. */
+	u16 usa_ofs;		/* Offset to the Update Sequence Array (usa)
+				   from the start of the ntfs record. */
+	u16 usa_count;		/* Number of u16 sized entries in the usa
+				   including the Update Sequence Number (usn),
+				   thus the number of fixups is the usa_count
+				   minus 1. */
+} __attribute__ ((__packed__)) NTFS_RECORD;
+
+/*
+ * System files mft record numbers. All these files are always marked as used
+ * in the bitmap attribute of the mft; presumably in order to avoid accidental
+ * allocation for random other mft records. Also, the sequence number for each
+ * of the system files is always equal to their mft record number and it is
+ * never modified.
+ */
+typedef enum {
+	FILE_MFT       = 0,	/* Master file table (mft). Data attribute
+				   contains the entries and bitmap attribute
+				   records which ones are in use (bit==1). */
+	FILE_MFTMirr   = 1,	/* Mft mirror: copy of first four mft records
+				   in data attribute. If cluster size > 4kiB,
+				   copy of first N mft records, with
+					N = cluster_size / mft_record_size. */
+	FILE_LogFile   = 2,	/* Journalling log in data attribute. */
+	FILE_Volume    = 3,	/* Volume name attribute and volume information
+				   attribute (flags and ntfs version). Windows
+				   refers to this file as volume DASD (Direct
+				   Access Storage Device). */
+	FILE_AttrDef   = 4,	/* Array of attribute definitions in data
+				   attribute. */
+	FILE_root      = 5,	/* Root directory. */
+	FILE_Bitmap    = 6,	/* Allocation bitmap of all clusters (lcns) in
+				   data attribute. */
+	FILE_Boot      = 7,	/* Boot sector (always at cluster 0) in data
+				   attribute. */
+	FILE_BadClus   = 8,	/* Contains all bad clusters in the non-resident
+				   data attribute. */
+	FILE_Secure    = 9,	/* Shared security descriptors in data attribute
+				   and two indexes into the descriptors.
+				   Appeared in Windows 2000. Before that, this
+				   file was named $Quota but was unused. */
+	FILE_UpCase    = 10,	/* Uppercase equivalents of all 65536 Unicode
+				   characters in data attribute. */
+	FILE_Extend    = 11,	/* Directory containing other system files (eg.
+				   $ObjId, $Quota, $Reparse and $UsnJrnl). This
+				   is new to NTFS3.0. */
+	FILE_reserved12 = 12,	/* Reserved for future use (records 12-15). */
+	FILE_reserved13 = 13,
+	FILE_reserved14 = 14,
+	FILE_reserved15 = 15,
+	FILE_first_user = 16,	/* First user file, used as test limit for
+				   whether to allow opening a file or not. */
+} NTFS_SYSTEM_FILES;
+
+/*
+ * These are the so far known MFT_RECORD_* flags (16-bit) which contain 
+ * information about the mft record in which they are present.
+ */
+typedef enum {
+	MFT_RECORD_IN_USE	= const_cpu_to_le16(0x0001),
+	MFT_RECORD_IS_DIRECTORY	= const_cpu_to_le16(0x0002),
+	MFT_REC_SPACE_FILLER	= 0xffff	/* Just to make flags 16-bit. */
+} __attribute__ ((__packed__)) MFT_RECORD_FLAGS;
+
+/*
+ * mft references (aka file references or file record segment references) are
+ * used whenever a structure needs to refer to a record in the mft.
+ * 
+ * A reference consists of a 48-bit index into the mft and a 16-bit sequence
+ * number used to detect stale references.
+ *
+ * For error reporting purposes we treat the 48-bit index as a signed quantity.
+ *
+ * The sequence number is a circular counter (skipping 0) describing how many
+ * times the referenced mft record has been (re)used. This has to match the
+ * sequence number of the mft record being referenced, otherwise the reference
+ * is considered stale and removed (FIXME: only ntfsck or the driver itself?).
+ *
+ * If the sequence number is zero it is assumed that no sequence number
+ * consistency checking should be performed.
+ *
+ * FIXME: Since inodes are 32-bit as of now, the driver needs to always check
+ * for high_part being 0 and if not either BUG(), cause a panic() or handle
+ * the situation in some other way. This shouldn't be a problem as a volume has
+ * to become HUGE in order to need more than 32-bits worth of mft records.
+ * Assuming the standard mft record size of 1kb only the records (never mind
+ * the non-resident attributes, etc.) would require 4Tb of space on their own
+ * for the first 32 bits worth of records. This is only if some strange person
+ * doesn't decide to foul play and make the mft sparse which would be a really
+ * horrible thing to do as it would trash our current driver implementation. )-:
+ * Do I hear screams "we want 64-bit inodes!" ?!? (-;
+ *
+ * FIXME: The mft zone is defined as the first 12% of the volume. This space is
+ * reserved so that the mft can grow contiguously and hence doesn't become 
+ * fragmented. Volume free space includes the empty part of the mft zone and
+ * when the volume's free 88% are used up, the mft zone is shrunk by a factor
+ * of 2, thus making more space available for more files/data. This process is
+ * repeated everytime there is no more free space except for the mft zone until
+ * there really is no more free space.
+ */
+
+/*
+ * Typedef the MFT_REF as a 64-bit value for easier handling.
+ * Also define two unpacking macros to get to the reference (MREF) and
+ * sequence number (MSEQNO) respectively.
+ * The _LE versions are to be applied on little endian MFT_REFs.
+ * Note: The _LE versions will return a CPU endian formatted value!
+ */
+typedef enum {
+	MFT_REF_MASK_CPU	= 0x0000ffffffffffffULL,
+	MFT_REF_MASK_LE		= const_cpu_to_le64(0x0000ffffffffffffULL),
+} MFT_REF_CONSTS;
+
+typedef u64 MFT_REF;
+
+#define MREF(x)		((u64)((x) & MFT_REF_MASK_CPU))
+#define MSEQNO(x)	((u16)(((x) >> 48) & 0xffff))
+#define MREF_LE(x)	((u64)(le64_to_cpu(x) & MFT_REF_MASK_CPU))
+#define MSEQNO_LE(x)	((u16)((le64_to_cpu(x) >> 48) & 0xffff))
+
+#define IS_ERR_MREF(x)	(((x) & 0x0000800000000000ULL) ? 1 : 0)
+#define ERR_MREF(x)	((u64)((s64)(x)))
+#define MREF_ERR(x)	((int)((s64)(x)))
+
+/*
+ * The mft record header present at the beginning of every record in the mft.
+ * This is followed by a sequence of variable length attribute records which
+ * is terminated by an attribute of type AT_END which is a truncated attribute
+ * in that it only consists of the attribute type code AT_END and none of the
+ * other members of the attribute structure are present.
+ */
+typedef struct {
+/*Ofs*/
+/*  0*/	NTFS_RECORD SN(mnr);	/* Usually the magic is "FILE". */
+/*  8*/	u64 lsn;		/* $LogFile sequence number for this record.
+				   Changed every time the record is modified. */
+/* 16*/	u16 sequence_number;	/* Number of times this mft record has been
+		   		   reused. (See description for MFT_REF
+				   above.) NOTE: The increment (skipping zero)
+				   is done when the file is deleted. NOTE: If
+				   this is zero it is left zero. */
+/* 18*/	u16 link_count; 	/* Number of hard links, i.e. the number of 
+				   directory entries referencing this record.
+				   NOTE: Only used in mft base records.
+				   NOTE: When deleting a directory entry we
+				   check the link_count and if it is 1 we
+				   delete the file. Otherwise we delete the
+				   FILE_NAME_ATTR being referenced by the
+				   directory entry from the mft record and
+				   decrement the link_count.
+				   FIXME: Careful with Win32 + DOS names! */
+/* 20*/	u16 attrs_offset;	/* Byte offset to the first attribute in this
+				   mft record from the start of the mft record.
+				   NOTE: Must be aligned to 8-byte boundary. */
+/* 22*/	MFT_RECORD_FLAGS flags;	/* Bit array of MFT_RECORD_FLAGS. When a file
+				   is deleted, the MFT_RECORD_IN_USE flag is
+				   set to zero. */
+/* 24*/	u32 bytes_in_use;	/* Number of bytes used in this mft record.
+				   NOTE: Must be aligned to 8-byte boundary. */
+/* 28*/	u32 bytes_allocated;	/* Number of bytes allocated for this mft
+				   record. This should be equal to the mft
+				   record size. */
+/* 32*/	MFT_REF base_mft_record; /* This is zero for base mft records.
+				   When it is not zero it is a mft reference
+				   pointing to the base mft record to which
+				   this record belongs (this is then used to
+				   locate the attribute list attribute present
+				   in the base record which describes this
+				   extension record and hence might need
+				   modification when the extension record
+				   itself is modified, also locating the
+				   attribute list also means finding the other
+				   potential extents, belonging to the non-base
+				   mft record). */
+/* 40*/	u16 next_attr_instance;	/* The instance number that will be
+				   assigned to the next attribute added to this
+				   mft record. NOTE: Incremented each time
+				   after it is used. NOTE: Every time the mft
+				   record is reused this number is set to zero.
+				   NOTE: The first instance number is always 0.
+				 */
+/* sizeof() = 42 bytes */
+/* NTFS 3.1+ (Windows XP and above) introduce the following additions. */
+/* 42*/ //u16 reserved;		/* Reserved/alignment. */
+/* 44*/ //u32 mft_record_number;/* Number of this mft record. */
+/* sizeof() = 48 bytes */
+/*
+ * When (re)using the mft record, we place the update sequence array at this
+ * offset, i.e. before we start with the attributes. This also makes sense,
+ * otherwise we could run into problems with the update sequence array
+ * containing in itself the last two bytes of a sector which would mean that
+ * multi sector transfer protection wouldn't work. As you can't protect data
+ * by overwriting it since you then can't get it back...
+ * When reading we obviously use the data from the ntfs record header.
+ */
+} __attribute__ ((__packed__)) MFT_RECORD;
+
+#define _MNR(X)  SC(mnr,X)
+
+/*
+ * System defined attributes (32-bit). Each attribute type has a corresponding
+ * attribute name (Unicode string of maximum 64 character length) as described
+ * by the attribute definitions present in the data attribute of the $AttrDef
+ * system file. On NTFS 3.0 volumes the names are just as the types are named
+ * in the below enum exchanging AT_ for the dollar sign ($). If that isn't a
+ * revealing choice of symbol... (-;
+ */
+typedef enum {
+	AT_UNUSED			= const_cpu_to_le32(         0),
+	AT_STANDARD_INFORMATION		= const_cpu_to_le32(      0x10),
+	AT_ATTRIBUTE_LIST		= const_cpu_to_le32(      0x20),
+	AT_FILE_NAME			= const_cpu_to_le32(      0x30),
+	AT_OBJECT_ID			= const_cpu_to_le32(      0x40),
+	AT_SECURITY_DESCRIPTOR		= const_cpu_to_le32(      0x50),
+	AT_VOLUME_NAME			= const_cpu_to_le32(      0x60),
+	AT_VOLUME_INFORMATION		= const_cpu_to_le32(      0x70),
+	AT_DATA				= const_cpu_to_le32(      0x80),
+	AT_INDEX_ROOT			= const_cpu_to_le32(      0x90),
+	AT_INDEX_ALLOCATION		= const_cpu_to_le32(      0xa0),
+	AT_BITMAP			= const_cpu_to_le32(      0xb0),
+	AT_REPARSE_POINT		= const_cpu_to_le32(      0xc0),
+	AT_EA_INFORMATION		= const_cpu_to_le32(      0xd0),
+	AT_EA				= const_cpu_to_le32(      0xe0),
+	AT_PROPERTY_SET			= const_cpu_to_le32(      0xf0),
+	AT_LOGGED_UTILITY_STREAM	= const_cpu_to_le32(     0x100),
+	AT_FIRST_USER_DEFINED_ATTRIBUTE	= const_cpu_to_le32(    0x1000),
+	AT_END				= const_cpu_to_le32(0xffffffff),
+} ATTR_TYPES;
+
+/*
+ * The collation rules for sorting views/indexes/etc (32-bit).
+ *
+ * COLLATION_UNICODE_STRING - Collate Unicode strings by comparing their binary
+ *	Unicode values, except that when a character can be uppercased, the
+ *	upper case value collates before the lower case one.
+ * COLLATION_FILE_NAME - Collate file names as Unicode strings. The collation
+ *	is done very much like COLLATION_UNICODE_STRING. In fact I have no idea
+ *	what the difference is. Perhaps the difference is that file names
+ *	would treat some special characters in an odd way (see
+ *	unistr.c::ntfs_collate_names() and unistr.c::legal_ansi_char_array[]
+ *	for what I mean but COLLATION_UNICODE_STRING would not give any special
+ *	treatment to any characters at all, but this is speculation.
+ * COLLATION_NTOFS_ULONG - Sorting is done according to ascending u32 key
+ * 	values. E.g. used for $SII index in FILE_Secure, which sorts by
+ * 	security_id (u32).
+ * COLLATION_NTOFS_SID - Sorting is done according to ascending SID values.
+ * 	E.g. used for $O index in FILE_Extend/$Quota.
+ * COLLATION_NTOFS_SECURITY_HASH - Sorting is done first by ascending hash
+ * 	values and second by ascending security_id values. E.g. used for $SDH
+ * 	index in FILE_Secure.
+ * COLLATION_NTOFS_ULONGS - Sorting is done according to a sequence of ascending
+ *	u32 key values. E.g. used for $O index in FILE_Extend/$ObjId, which
+ *	sorts by object_id (16-byte), by splitting up the object_id in four
+ *	u32 values and using them as individual keys. E.g. take the following
+ *	two security_ids, stored as follows on disk:
+ *		1st: a1 61 65 b7 65 7b d4 11 9e 3d 00 e0 81 10 42 59
+ *		2nd: 38 14 37 d2 d2 f3 d4 11 a5 21 c8 6b 79 b1 97 45
+ *	To compare them, they are split into four u32 values each, like so:
+ *		1st: 0xb76561a1 0x11d47b65 0xe0003d9e 0x59421081
+ *		2nd: 0xd2371438 0x11d4f3d2 0x6bc821a5 0x4597b179
+ *	Now, it is apparent why the 2nd object_id collates after the 1st: the
+ *	first u32 value of the 1st object_id is less than the first u32 of
+ *	the 2nd object_id. If the first u32 values of both object_ids were
+ *	equal then the second u32 values would be compared, etc.
+ */
+typedef enum {
+	COLLATION_BINARY	 = const_cpu_to_le32(0), /* Collate by binary
+					compare where the first byte is most
+					significant. */
+	COLLATION_FILE_NAME	 = const_cpu_to_le32(1), /* Collate file names
+					as Unicode strings. */
+	COLLATION_UNICODE_STRING = const_cpu_to_le32(2), /* Collate Unicode
+					strings by comparing their binary
+					Unicode values, except that when a
+					character can be uppercased, the upper
+					case value collates before the lower
+					case one. */
+	COLLATION_NTOFS_ULONG		= const_cpu_to_le32(16),
+	COLLATION_NTOFS_SID		= const_cpu_to_le32(17),
+	COLLATION_NTOFS_SECURITY_HASH	= const_cpu_to_le32(18),
+	COLLATION_NTOFS_ULONGS		= const_cpu_to_le32(19),
+} COLLATION_RULES;
+
+/*
+ * The flags (32-bit) describing attribute properties in the attribute
+ * definition structure. FIXME: This information is from Regis's information
+ * and, according to him, it is not certain and probably incomplete.
+ * The INDEXABLE flag is fairly certainly correct as only the file name
+ * attribute has this flag set and this is the only attribute indexed in NT4.
+ */
+typedef enum {
+	INDEXABLE	    = const_cpu_to_le32(0x02),	/* Attribute can be
+							   indexed. */
+	NEED_TO_REGENERATE  = const_cpu_to_le32(0x40),	/* Need to regenerate
+							   during regeneration
+							   phase. */
+	CAN_BE_NON_RESIDENT = const_cpu_to_le32(0x80),	/* Attribute can be
+							   non-resident. */
+} ATTR_DEF_FLAGS;
+
+/*
+ * The data attribute of FILE_AttrDef contains a sequence of attribute
+ * definitions for the NTFS volume. With this, it is supposed to be safe for an
+ * older NTFS driver to mount a volume containing a newer NTFS version without
+ * damaging it (that's the theory. In practice it's: not damaging it too much).
+ * Entries are sorted by attribute type. The flags describe whether the
+ * attribute can be resident/non-resident and possibly other things, but the
+ * actual bits are unknown.
+ */
+typedef struct {
+/*hex ofs*/
+/*  0*/	uchar_t name[0x40];		/* Unicode name of the attribute. Zero
+					   terminated. */
+/* 80*/	ATTR_TYPES type;		/* Type of the attribute. */
+/* 84*/	u32 display_rule;		/* Default display rule.
+					   FIXME: What does it mean? (AIA) */
+/* 88*/ COLLATION_RULES collation_rule;	/* Default collation rule. */
+/* 8c*/	ATTR_DEF_FLAGS flags;		/* Flags describing the attribute. */
+/* 90*/	u64 min_size;			/* Optional minimum attribute size. */
+/* 98*/	u64 max_size;			/* Maximum size of attribute. */
+/* sizeof() = 0xa0 or 160 bytes */
+} __attribute__ ((__packed__)) ATTR_DEF;
+
+/*
+ * Attribute flags (16-bit). 
+ */
+typedef enum {
+	ATTR_IS_COMPRESSED	= const_cpu_to_le16(0x0001),
+	ATTR_COMPRESSION_MASK	= const_cpu_to_le16(0x00ff),  /* Compression
+						method mask. Also, first
+						illegal value. */
+	ATTR_IS_ENCRYPTED	= const_cpu_to_le16(0x4000),
+	ATTR_IS_SPARSE		= const_cpu_to_le16(0x8000),
+} __attribute__ ((__packed__)) ATTR_FLAGS;
+
+/*
+ * Attribute compression.
+ *
+ * Only the data attribute is ever compressed in the current ntfs driver in
+ * Windows. Further, compression is only applied when the data attribute is
+ * non-resident. Finally, to use compression, the maximum allowed cluster size
+ * on a volume is 4kib.
+ *
+ * The compression method is based on independently compressing blocks of X
+ * clusters, where X is determined from the compression_unit value found in the
+ * non-resident attribute record header (more precisely: X = 2^compression_unit
+ * clusters). On Windows NT/2k, X always is 16 clusters (compression_unit = 4).
+ *
+ * There are three different cases of how a compression block of X clusters
+ * can be stored:
+ *
+ *   1) The data in the block is all zero (a sparse block):
+ *	  This is stored as a sparse block in the run list, i.e. the run list
+ *	  entry has length = X and lcn = -1. The mapping pairs array actually
+ *	  uses a delta_lcn value length of 0, i.e. delta_lcn is not present at
+ *	  all, which is then interpreted by the driver as lcn = -1.
+ *	  NOTE: Even uncompressed files can be sparse on NTFS 3.0 volumes, then
+ *	  the same principles apply as above, except that the length is not
+ *	  restricted to being any particular value.
+ *
+ *   2) The data in the block is not compressed:
+ *	  This happens when compression doesn't reduce the size of the block
+ *	  in clusters. I.e. if compression has a small effect so that the
+ *	  compressed data still occupies X clusters, then the uncompressed data
+ *	  is stored in the block.
+ *	  This case is recognised by the fact that the run list entry has
+ *	  length = X and lcn >= 0. The mapping pairs array stores this as
+ *	  normal with a run length of X and some specific delta_lcn, i.e.
+ *	  delta_lcn has to be present.
+ *
+ *   3) The data in the block is compressed:
+ *	  The common case. This case is recognised by the fact that the run
+ *	  list entry has length L < X and lcn >= 0. The mapping pairs array
+ *	  stores this as normal with a run length of X and some specific
+ *	  delta_lcn, i.e. delta_lcn has to be present. This run list entry is
+ *	  immediately followed by a sparse entry with length = X - L and
+ *	  lcn = -1. The latter entry is to make up the vcn counting to the
+ *	  full compression block size X.
+ *
+ * In fact, life is more complicated because adjacent entries of the same type
+ * can be coalesced. This means that one has to keep track of the number of
+ * clusters handled and work on a basis of X clusters at a time being one
+ * block. An example: if length L > X this means that this particular run list
+ * entry contains a block of length X and part of one or more blocks of length
+ * L - X. Another example: if length L < X, this does not necessarily mean that
+ * the block is compressed as it might be that the lcn changes inside the block
+ * and hence the following run list entry describes the continuation of the
+ * potentially compressed block. The block would be compressed if the
+ * following run list entry describes at least X - L sparse clusters, thus
+ * making up the compression block length as described in point 3 above. (Of
+ * course, there can be several run list entries with small lengths so that the
+ * sparse entry does not follow the first data containing entry with
+ * length < X.)
+ *
+ * NOTE: At the end of the compressed attribute value, there most likely is not
+ * just the right amount of data to make up a compression block, thus this data
+ * is not even attempted to be compressed. It is just stored as is, unless
+ * the number of clusters it occupies is reduced when compressed in which case
+ * it is stored as a compressed compression block, complete with sparse
+ * clusters at the end.
+ */
+
+/*
+ * Flags of resident attributes (8-bit).
+ */
+typedef enum {
+	RESIDENT_ATTR_IS_INDEXED = 0x01, /* Attribute is referenced in an index
+					    (has implications for deleting and
+					    modifying the attribute). */
+} __attribute__ ((__packed__)) RESIDENT_ATTR_FLAGS;
+
+/*
+ * Attribute record header. Always aligned to 8-byte boundary.
+ */
+typedef struct {
+/*Ofs*/
+/*  0*/	ATTR_TYPES type;	/* The (32-bit) type of the attribute. */
+/*  4*/	u32 length;		/* Byte size of the resident part of the
+				   attribute (aligned to 8-byte boundary).
+				   Used to get to the next attribute. */
+/*  8*/	u8 non_resident;	/* If 0, attribute is resident.
+				   If 1, attribute is non-resident. */
+/*  9*/	u8 name_length;		/* Unicode character size of name of attribute.
+				   0 if unnamed. */
+/* 10*/	u16 name_offset;	/* If name_length != 0, the byte offset to the
+				   beginning of the name from the attribute
+				   record. Note that the name is stored as a
+				   Unicode string. When creating, place offset
+				   just at the end of the record header. Then,
+				   follow with attribute value or mapping pairs
+				   array, resident and non-resident attributes
+				   respectively, aligning to an 8-byte
+				   boundary. */
+/* 12*/	ATTR_FLAGS flags;	/* Flags describing the attribute. */
+/* 14*/	u16 instance;		/* The instance of this attribute record. This
+				   number is unique within this mft record (see 
+				   MFT_RECORD/next_attribute_instance notes in
+				   in mft.h for more details). */
+/* 16*/	union {
+		/* Resident attributes. */
+		struct {
+/* 16 */		u32 value_length; /* Byte size of attribute value. */
+/* 20 */		u16 value_offset; /* Byte offset of the attribute
+					     value from the start of the
+					     attribute record. When creating,
+					     align to 8-byte boundary if we 
+					     have a name present as this might
+					     not have a length of a multiple
+					     of 8-bytes. */
+/* 22 */		RESIDENT_ATTR_FLAGS resident_flags; /* See above. */
+/* 23 */		s8 reservedR;	  /* Reserved/alignment to 8-byte
+					     boundary. */
+		} SN(ara) __attribute__ ((__packed__));
+		/* Non-resident attributes. */
+		struct {
+/* 16*/			VCN lowest_vcn;	/* Lowest valid virtual cluster number
+				for this portion of the attribute value or
+				0 if this is the only extent (usually the
+				case). - Only when an attribute list is used
+				does lowest_vcn != 0 ever occur. */
+/* 24*/			VCN highest_vcn; /* Highest valid vcn of this extent of
+				the attribute value. - Usually there is only one
+				portion, so this usually equals the attribute
+				value size in clusters minus 1. Can be -1 for
+				zero length files. Can be 0 for "single extent"
+				attributes. */
+/* 32*/			u16 mapping_pairs_offset; /* Byte offset from the
+				beginning of the structure to the mapping pairs
+				array which contains the mappings between the
+				vcns and the logical cluster numbers (lcns).
+				When creating, place this at the end of this
+				record header aligned to 8-byte boundary. */
+/* 34*/			u8 compression_unit; /* The compression unit expressed
+				as the log to the base 2 of the number of
+				clusters in a compression unit. 0 means not
+				compressed. (This effectively limits the
+				compression unit size to be a power of two
+				clusters.) WinNT4 only uses a value of 4. */
+/* 35*/			u8 reserved1[5];	/* Align to 8-byte boundary. */
+/* The sizes below are only used when lowest_vcn is zero, as otherwise it would
+   be difficult to keep them up-to-date.*/
+/* 40*/			s64 allocated_size;	/* Byte size of disk space
+				allocated to hold the attribute value. Always
+				is a multiple of the cluster size. When a file
+				is compressed, this field is a multiple of the
+				compression block size (2^compression_unit) and
+				it represents the logically allocated space
+				rather than the actual on disk usage. For this
+				use the compressed_size (see below). */
+/* 48*/			s64 data_size;	/* Byte size of the attribute
+				value. Can be larger than allocated_size if
+				attribute value is compressed or sparse. */
+/* 56*/			s64 initialized_size;	/* Byte size of initialized
+				portion of the attribute value. Usually equals
+				data_size. */
+/* sizeof(uncompressed attr) = 64*/
+/* 64*/			s64 compressed_size;	/* Byte size of the attribute
+				value after compression. Only present when
+				compressed. Always is a multiple of the
+				cluster size. Represents the actual amount of
+				disk space being used on the disk. */
+/* sizeof(compressed attr) = 72*/
+		} SN(anr) __attribute__ ((__packed__));
+	} SN(aua) __attribute__ ((__packed__));
+} __attribute__ ((__packed__)) ATTR_RECORD;
+
+#define _ARA(X)  SC(aua.ara,X)
+#define _ANR(X)  SC(aua.anr,X)
+
+typedef ATTR_RECORD ATTR_REC;
+
+/*
+ * File attribute flags (32-bit).
+ */
+typedef enum {
+	/*
+	 * These flags are only presnt in the STANDARD_INFORMATION attribute
+	 * (in the field file_attributes).
+	 */
+	FILE_ATTR_READONLY		= const_cpu_to_le32(0x00000001),
+	FILE_ATTR_HIDDEN		= const_cpu_to_le32(0x00000002),
+	FILE_ATTR_SYSTEM		= const_cpu_to_le32(0x00000004),
+	/* Old DOS volid. Unused in NT.	= cpu_to_le32(0x00000008), */
+
+	FILE_ATTR_DIRECTORY		= const_cpu_to_le32(0x00000010),
+	/* FILE_ATTR_DIRECTORY is not considered valid in NT. It is reserved
+	   for the DOS SUBDIRECTORY flag. */
+	FILE_ATTR_ARCHIVE		= const_cpu_to_le32(0x00000020),
+	FILE_ATTR_DEVICE		= const_cpu_to_le32(0x00000040),
+	FILE_ATTR_NORMAL		= const_cpu_to_le32(0x00000080),
+
+	FILE_ATTR_TEMPORARY		= const_cpu_to_le32(0x00000100),
+	FILE_ATTR_SPARSE_FILE		= const_cpu_to_le32(0x00000200),
+	FILE_ATTR_REPARSE_POINT		= const_cpu_to_le32(0x00000400),
+	FILE_ATTR_COMPRESSED		= const_cpu_to_le32(0x00000800),
+
+	FILE_ATTR_OFFLINE		= const_cpu_to_le32(0x00001000),
+	FILE_ATTR_NOT_CONTENT_INDEXED	= const_cpu_to_le32(0x00002000),
+	FILE_ATTR_ENCRYPTED		= const_cpu_to_le32(0x00004000),
+
+	FILE_ATTR_VALID_FLAGS		= const_cpu_to_le32(0x00007fb7),
+	/* FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the 
+	   FILE_ATTR_DEVICE and preserves everything else. This mask
+	   is used to obtain all flags that are valid for reading. */
+	FILE_ATTR_VALID_SET_FLAGS	= const_cpu_to_le32(0x000031a7),
+	/* FILE_ATTR_VALID_SET_FLAGS masks out the old DOS VolId, the
+	   F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT,
+	   F_A_COMPRESSED and F_A_ENCRYPTED and preserves the rest. This mask
+	   is used to to obtain all flags that are valid for setting. */
+
+	/*
+	 * These flags are only present in the FILE_NAME attribute (in the
+	 * field file_attributes).
+	 */
+	FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT	= const_cpu_to_le32(0x10000000),
+	/* This is a copy of the corresponding bit from the mft record, telling
+	   us whether this is a directory or not, i.e. whether it has an
+	   index root attribute or not. */
+	FILE_ATTR_DUP_VIEW_INDEX_PRESENT	= const_cpu_to_le32(0x20000000),
+	/* This is a copy of the corresponding bit from the mft record, telling
+	   us whether this file has a view index present (eg. object id index,
+	   quota index, one of the security indexes or the encrypting file
+	   system related indexes). */
+} FILE_ATTR_FLAGS;
+
+/*
+ * NOTE on times in NTFS: All times are in MS standard time format, i.e. they
+ * are the number of 100-nanosecond intervals since 1st January 1601, 00:00:00
+ * universal coordinated time (UTC). (In Linux time starts 1st January 1970,
+ * 00:00:00 UTC and is stored as the number of 1-second intervals since then.)
+ */
+
+/*
+ * Attribute: Standard information (0x10).
+ *
+ * NOTE: Always resident.
+ * NOTE: Present in all base file records on a volume.
+ * NOTE: There is conflicting information about the meaning of each of the time
+ * 	 fields but the meaning as defined below has been verified to be
+ * 	 correct by practical experimentation on Windows NT4 SP6a and is hence
+ * 	 assumed to be the one and only correct interpretation.
+ */
+typedef struct {
+/*Ofs*/
+/*  0*/	s64 creation_time;		/* Time file was created. Updated when
+					   a filename is changed(?). */
+/*  8*/	s64 last_data_change_time;	/* Time the data attribute was last
+					   modified. */
+/* 16*/	s64 last_mft_change_time;	/* Time this mft record was last
+					   modified. */
+/* 24*/	s64 last_access_time;		/* Approximate time when the file was
+					   last accessed (obviously this is not
+					   updated on read-only volumes). In
+					   Windows this is only updated when
+					   accessed if some time delta has
+					   passed since the last update. Also,
+					   last access times updates can be
+					   disabled altogether for speed. */
+/* 32*/	FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */
+/* 36*/	union {
+		/* NTFS 1.2 (and previous, presumably) */
+/* 36 */	u8 reserved12[12];	/* Reserved/alignment to 8-byte
+					   boundary. */
+/* sizeof() = 48 bytes */
+		/* NTFS 3.0 */
+		struct {
+/*
+ * If a volume has been upgraded from a previous NTFS version, then these
+ * fields are present only if the file has been accessed since the upgrade.
+ * Recognize the difference by comparing the length of the resident attribute
+ * value. If it is 48, then the following fields are missing. If it is 72 then
+ * the fields are present. Maybe just check like this:
+ * 	if (resident.ValueLength < sizeof(STANDARD_INFORMATION)) {
+ * 		Assume NTFS 1.2- format.
+ * 		If (volume version is 3.0+)
+ * 			Upgrade attribute to NTFS 3.0 format.
+ * 		else
+ * 			Use NTFS 1.2- format for access.
+ * 	} else
+ * 		Use NTFS 3.0 format for access.
+ * Only problem is that it might be legal to set the length of the value to
+ * arbitrarily large values thus spoiling this check. - But chkdsk probably
+ * views that as a corruption, assuming that it behaves like this for all
+ * attributes.
+ */
+		/* 36*/	u32 maximum_versions;	/* Maximum allowed versions for
+				file. Zero if version numbering is disabled. */
+		/* 40*/	u32 version_number;	/* This file's version (if any).
+				Set to zero if maximum_versions is zero. */
+		/* 44*/	u32 class_id;		/* Class id from bidirectional
+				class id index (?). */
+		/* 48*/	u32 owner_id;		/* Owner_id of the user owning
+				the file. Translate via $Q index in FILE_Extend
+				/$Quota to the quota control entry for the user
+				owning the file. Zero if quotas are disabled. */
+		/* 52*/	u32 security_id;	/* Security_id for the file.
+				Translate via $SII index and $SDS data stream
+				in FILE_Secure to the security descriptor. */
+		/* 56*/	u64 quota_charged;	/* Byte size of the charge to
+				the quota for all streams of the file. Note: Is
+				zero if quotas are disabled. */
+		/* 64*/	u64 usn;		/* Last update sequence number
+				of the file. This is a direct index into the
+				change (aka usn) journal file. It is zero if
+				the usn journal is disabled.
+				NOTE: To disable the journal need to delete
+				the journal file itself and to then walk the
+				whole mft and set all Usn entries in all mft
+				records to zero! (This can take a while!)
+				The journal is FILE_Extend/$UsnJrnl. Win2k
+				will recreate the journal and initiate
+				logging if necessary when mounting the
+				partition. This, in contrast to disabling the
+				journal is a very fast process, so the user
+				won't even notice it. */
+		} SN(svs);
+	} SN(sei);
+/* sizeof() = 72 bytes (NTFS 3.0) */
+} __attribute__ ((__packed__)) STANDARD_INFORMATION;
+
+#define _SVS(X)  SC(sei.svs,X)
+
+/*
+ * Attribute: Attribute list (0x20).
+ *
+ * - Can be either resident or non-resident.
+ * - Value consists of a sequence of variable length, 8-byte aligned,
+ * ATTR_LIST_ENTRY records.
+ * - The list is not terminated by anything at all! The only way to know when
+ * the end is reached is to keep track of the current offset and compare it to
+ * the attribute value size.
+ * - The attribute list attribute contains one entry for each attribute of
+ * the file in which the list is located, except for the list attribute
+ * itself. The list is sorted: first by attribute type, second by attribute
+ * name (if present), third by instance number. The extents of one
+ * non-resident attribute (if present) immediately follow after the initial
+ * extent. They are ordered by lowest_vcn and have their instace set to zero. 
+ * It is not allowed to have two attributes with all sorting keys equal.
+ * - Further restrictions: 
+ * 	- If not resident, the vcn to lcn mapping array has to fit inside the
+ * 	  base mft record.
+ * 	- The attribute list attribute value has a maximum size of 256kb. This
+ * 	  is imposed by the Windows cache manager.
+ * - Attribute lists are only used when the attributes of mft record do not
+ * fit inside the mft record despite all attributes (that can be made
+ * non-resident) having been made non-resident. This can happen e.g. when:
+ *  	- File has a large number of hard links (lots of file name
+ *  	  attributes present).
+ *  	- The mapping pairs array of some non-resident attribute becomes so
+ *	  large due to fragmentation that it overflows the mft record.
+ *  	- The security descriptor is very complex (not applicable to
+ *  	  NTFS 3.0 volumes).
+ *  	- There are many named streams.
+ */
+typedef struct {
+/*Ofs*/
+/*  0*/	ATTR_TYPES type;	/* Type of referenced attribute. */
+/*  4*/	u16 length;		/* Byte size of this entry (8-byte aligned). */
+/*  6*/	u8 name_length;		/* Size in Unicode chars of the name of the
+				   attribute or 0 if unnamed. */
+/*  7*/	u8 name_offset;		/* Byte offset to beginning of attribute name
+				   (always set this to where the name would
+				   start even if unnamed). */
+/*  8*/	VCN lowest_vcn;		/* Lowest virtual cluster number of this portion
+				   of the attribute value. This is usually 0. It
+				   is non-zero for the case where one attribute
+				   does not fit into one mft record and thus
+				   several mft records are allocated to hold
+				   this attribute. In the latter case, each mft
+				   record holds one extent of the attribute and
+				   there is one attribute list entry for each
+				   extent. NOTE: This is DEFINITELY a signed
+				   value! The windows driver uses cmp, followed
+				   by jg when comparing this, thus it treats it
+				   as signed. */
+/* 16*/	MFT_REF mft_reference;	/* The reference of the mft record holding
+				   the ATTR_RECORD for this portion of the
+				   attribute value. */
+/* 24*/	u16 instance;		/* If lowest_vcn = 0, the instance of the
+				   attribute being referenced; otherwise 0. */
+/* 26*/	uchar_t name[0];	/* Use when creating only. When reading use
+				   name_offset to determine the location of the
+				   name. */
+/* sizeof() = 26 + (attribute_name_length * 2) bytes */
+} __attribute__ ((__packed__)) ATTR_LIST_ENTRY;
+
+/*
+ * The maximum allowed length for a file name.
+ */
+#define MAXIMUM_FILE_NAME_LENGTH	255
+
+/*
+ * Possible namespaces for filenames in ntfs (8-bit).
+ */
+typedef enum {
+	FILE_NAME_POSIX			= 0x00,
+		/* This is the largest namespace. It is case sensitive and 
+		   allows all Unicode characters except for: '\0' and '/'.
+		   Beware that in WinNT/2k files which eg have the same name
+		   except for their case will not be distinguished by the
+		   standard utilities and thus a "del filename" will delete
+		   both "filename" and "fileName" without warning. */
+	FILE_NAME_WIN32			= 0x01,
+		/* The standard WinNT/2k NTFS long filenames. Case insensitive.
+		   All Unicode chars except: '\0', '"', '*', '/', ':', '<', 
+		   '>', '?', '\' and '|'. Further, names cannot end with a '.'
+		   or a space. */
+	FILE_NAME_DOS			= 0x02,
+		/* The standard DOS filenames (8.3 format). Uppercase only.
+		   All 8-bit characters greater space, except: '"', '*', '+',
+		   ',', '/', ':', ';', '<', '=', '>', '?' and '\'. */
+	FILE_NAME_WIN32_AND_DOS		= 0x03, 
+		/* 3 means that both the Win32 and the DOS filenames are
+		   identical and hence have been saved in this single filename
+		   record. */
+} __attribute__ ((__packed__)) FILE_NAME_TYPE_FLAGS;
+
+/*
+ * Attribute: Filename (0x30).
+ *
+ * NOTE: Always resident.
+ * NOTE: All fields, except the parent_directory, are only updated when the
+ *	 filename is changed. Until then, they just become out of sync with
+ *	 reality and the more up to date values are present in the standard
+ *	 information attribute.
+ * NOTE: There is conflicting information about the meaning of each of the time
+ * 	 fields but the meaning as defined below has been verified to be
+ * 	 correct by practical experimentation on Windows NT4 SP6a and is hence
+ * 	 assumed to be the one and only correct interpretation.
+ */
+typedef struct {
+/*hex ofs*/
+/*  0*/	MFT_REF parent_directory;	/* Directory this filename is
+					   referenced from. */
+/*  8*/	s64 creation_time;		/* Time file was created. */
+/* 10*/	s64 last_data_change_time;	/* Time the data attribute was last
+					   modified. */
+/* 18*/	s64 last_mft_change_time;	/* Time this mft record was last
+					   modified. */
+/* 20*/	s64 last_access_time;		/* Last time this mft record was
+					   accessed. */
+/* 28*/	s64 allocated_size;		/* Byte size of allocated space for the
+					   data attribute. NOTE: Is a multiple
+					   of the cluster size. */
+/* 30*/	s64 data_size;			/* Byte size of actual data in data
+					   attribute. NOTE: Only present when
+					   lowest_vcn is 0. */
+/* 38*/	FILE_ATTR_FLAGS file_attributes;	/* Flags describing the file. */
+/* 3c*/	union {
+	/* 3c*/	struct {
+		/* 3c*/	u16 packed_ea_size;	/* Size of the buffer needed to
+						   pack the extended attributes
+						   (EAs), if such are present.*/
+		/* 3e*/	u16 reserved;		/* Reserved for alignment. */
+		} SN(fea) __attribute__ ((__packed__));
+	/* 3c*/	u32 reparse_point_tag;		/* Type of reparse point,
+						   present only in reparse
+						   points and only if there are
+						   no EAs. */
+	} SN(fer) __attribute__ ((__packed__));
+/* 40*/	u8 file_name_length;			/* Length of file name in
+						   (Unicode) characters. */
+/* 41*/	FILE_NAME_TYPE_FLAGS file_name_type;	/* Namespace of the file name.*/
+/* 42*/	uchar_t file_name[0];			/* File name in Unicode. */
+} __attribute__ ((__packed__)) FILE_NAME_ATTR;
+
+#define _FEA(X)  SC(fer.fea,X)
+#define _FER(X)  SC(fer,X)
+
+/*
+ * GUID structures store globally unique identifiers (GUID). A GUID is a 
+ * 128-bit value consisting of one group of eight hexadecimal digits, followed
+ * by three groups of four hexadecimal digits each, followed by one group of
+ * twelve hexadecimal digits. GUIDs are Microsoft's implementation of the
+ * distributed computing environment (DCE) universally unique identifier (UUID).
+ * Example of a GUID:
+ * 	1F010768-5A73-BC91-0010A52216A7
+ */
+typedef struct {
+	u32 data1;	/* The first eight hexadecimal digits of the GUID. */
+	u16 data2;	/* The first group of four hexadecimal digits. */
+	u16 data3;	/* The second group of four hexadecimal digits. */
+	u8 data4[8];	/* The first two bytes are the third group of four
+			   hexadecimal digits. The remaining six bytes are the
+			   final 12 hexadecimal digits. */
+} __attribute__ ((__packed__)) GUID;
+
+/*
+ * FILE_Extend/$ObjId contains an index named $O. This index contains all
+ * object_ids present on the volume as the index keys and the corresponding
+ * mft_record numbers as the index entry data parts. The data part (defined
+ * below) also contains three other object_ids:
+ *	birth_volume_id - object_id of FILE_Volume on which the file was first
+ *			  created. Optional (i.e. can be zero).
+ *	birth_object_id - object_id of file when it was first created. Usually
+ *			  equals the object_id. Optional (i.e. can be zero).
+ *	domain_id	- Reserved (always zero).
+ */
+typedef struct {
+	MFT_REF mft_reference;	/* Mft record containing the object_id in
+				   the index entry key. */
+	union {
+		struct {
+			GUID birth_volume_id;
+			GUID birth_object_id;
+			GUID domain_id;
+		} SN(obv) __attribute__ ((__packed__));
+		u8 extended_info[48];
+	} SN(oei) __attribute__ ((__packed__));
+} __attribute__ ((__packed__)) OBJ_ID_I