NTFS: 2.1.21 release

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 7d600c0f4c86a8a3733178dc822791cadbb48ce3..970e54f04e89d8f7dca27b4da936e79ea068e6cc 100644 (file)
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -277,6 +277,10 @@ ChangeLog
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.1.21:
+       - Fix several race conditions and various other bugs.
+       - Many internal cleanups, code reorganization, optimizations, and mft
+         and index record writing code rewritten to fit in with the changes.
 2.1.20:
        - Fix two stupid bugs introduced in 2.1.18 release.
 2.1.19:

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 218b4c8bb947d12df7fbfc2d384f70436896adf8..d526921af13ed289c3a1903ceaf5ecde018854e5 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -21,7 +21,7 @@ ToDo/Notes:
        - Enable the code for setting the NT4 compatibility flag when we start
          making NTFS 1.2 specific modifications.
 
-2.1.21-WIP
+2.1.21 - Fix some races and bugs, rewrite mft write code, add mft allocator.
 
        - Implement extent mft record deallocation
          fs/ntfs/mft.c::ntfs_extent_mft_record_free().
@@ -115,7 +115,7 @@ ToDo/Notes:
          fs/ntfs/inode.c::ntfs_clear_big_inode().  (Thanks to Christoph
          Hellwig for spotting this.)
        - Fix race condition in fs/ntfs/inode.c::ntfs_put_inode() by taking the
-         inode semaphore around the code thst sets ni->itype.index.bmp_ino to
+         inode semaphore around the code that sets ni->itype.index.bmp_ino to
          NULL and reorganize the code to optimize it a bit.  (Thanks to
          Christoph Hellwig for spotting this.)
        - Modify fs/ntfs/aops.c::mark_ntfs_record_dirty() to no longer take the

diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile
index 94f0775898a4efdd1cfad7ce56140d3c310d0b47..99cac1cd42856e334e35f5b90f171307496b5bd7 100644 (file)
--- a/fs/ntfs/Makefile
+++ b/fs/ntfs/Makefile
@@ -6,7 +6,7 @@ ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
             index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
             unistr.o upcase.o
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.21-WIP\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.21\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG