[PATCH 9/10] Re: [2.6-BK-URL] NTFS: 2.1.19 sparse annotation, cleanupsand a bugfix

[Anton Altaparmakov]

This is patch 9/10 in the series.  It contains the following ChangeSet:

<aia21@xxxxxxxxxx> (04/09/24 1.1952.1.4)
   NTFS: 2.1.19 - Many cleanups, improvements, and a minor bug fix.
   
   - Fix bug found by the new sparse bitwise warnings where the default
     upcase table was defined as a pointer to wchar_t rather than ntfschar
     in fs/ntfs/ntfs.h and super.c.
   
   Signed-off-by: Anton Altaparmakov <aia21@xxxxxxxxxx>

Best regards,

	Anton
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/, http://www-stu.christs.cam.ac.uk/~aia21/

===================================================================

diff -Nru a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
--- a/Documentation/filesystems/ntfs.txt	2004-09-24 17:06:31 +01:00
+++ b/Documentation/filesystems/ntfs.txt	2004-09-24 17:06:31 +01:00
@@ -277,6 +277,11 @@
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.1.19:
+	- Minor bugfix in handling of the default upcase table.
+	- Many internal cleanups and improvements.  Many thanks to Linus
+	  Torvalds and Al Viro for the help and advice with the sparse
+	  annotations and cleanups.
 2.1.18:
 	- Fix scheduling latencies at mount time.  (Ingo Molnar)
 	- Fix endianness bug in a little traversed portion of the attribute
diff -Nru a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
--- a/fs/ntfs/ChangeLog	2004-09-24 17:06:31 +01:00
+++ b/fs/ntfs/ChangeLog	2004-09-24 17:06:31 +01:00
@@ -21,7 +21,7 @@
 	- Enable the code for setting the NT4 compatibility flag when we start
 	  making NTFS 1.2 specific modifications.
 
-2.1.19-WIP
+2.1.19 - Many cleanups, improvements, and a minor bug fix.
 
 	- Update ->setattr (fs/ntfs/inode.c::ntfs_setattr()) to refuse to
 	  change the uid, gid, and mode of an inode as we do not support NTFS
@@ -51,6 +51,9 @@
 	- Fix all the sparse bitwise warnings.  Had to change all the enums
 	  storing little endian values to #defines because we cannot set enums
 	  to be little endian so we had lots of bitwise warnings from sparse.
+	- Fix a bug found by the new sparse bitwise warnings where the default
+	  upcase table was defined as a pointer to wchar_t rather than ntfschar
+	  in fs/ntfs/ntfs.h and super.c.
 
 2.1.18 - Fix scheduling latencies at mount time as well as an endianness bug.
 
diff -Nru a/fs/ntfs/Makefile b/fs/ntfs/Makefile
--- a/fs/ntfs/Makefile	2004-09-24 17:06:31 +01:00
+++ b/fs/ntfs/Makefile	2004-09-24 17:06:31 +01:00
@@ -6,7 +6,7 @@
 	     index.o inode.o mft.o mst.o namei.o super.o sysctl.o unistr.o \
 	     upcase.o
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.19-WIP\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.19\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff -Nru a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h
--- a/fs/ntfs/ntfs.h	2004-09-24 17:06:31 +01:00
+++ b/fs/ntfs/ntfs.h	2004-09-24 17:06:31 +01:00
@@ -156,7 +156,7 @@
 
 /* From fs/ntfs/super.c */
 #define default_upcase_len 0x10000
-extern wchar_t *default_upcase;
+extern ntfschar *default_upcase;
 extern unsigned long ntfs_nr_upcase_users;
 extern struct semaphore ntfs_lock;
 
diff -Nru a/fs/ntfs/super.c b/fs/ntfs/super.c
--- a/fs/ntfs/super.c	2004-09-24 17:06:31 +01:00
+++ b/fs/ntfs/super.c	2004-09-24 17:06:31 +01:00
@@ -2574,7 +2574,7 @@
 kmem_cache_t *ntfs_index_ctx_cache;
 
 /* A global default upcase table and a corresponding reference count. */
-wchar_t *default_upcase = NULL;
+ntfschar *default_upcase = NULL;
 unsigned long ntfs_nr_upcase_users = 0;
 
 /* Driver wide semaphore. */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/