[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs ntfs.h,1.31,1.32 super.c,1.79,1.80 types.h,1.4,1.5

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv21518/linux/fs/ntfs

Modified Files:
	ntfs.h super.c types.h 
Log Message:
Update to latest kernel (2.5.6-pre2)


Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- ntfs.h	4 Mar 2002 22:56:14 -0000	1.31
+++ ntfs.h	5 Mar 2002 00:22:24 -0000	1.32
@@ -27,6 +27,6 @@
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3)
-#	error The NTFS driver requires at least kernel 2.5.3-pre3.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,5)
+#	error The NTFS driver requires at least kernel 2.5.5.
 #endif
 
@@ -40,8 +40,8 @@
 #include <asm/atomic.h>
 
+#include "types.h"
 #include "debug.h"
 #include "malloc.h"
 #include "endian.h"
-#include "types.h"
 #include "volume.h"
 #include "inode.h"

Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -U2 -r1.79 -r1.80
--- super.c	4 Mar 2002 22:56:15 -0000	1.79
+++ super.c	5 Mar 2002 00:22:24 -0000	1.80
@@ -1500,6 +1500,6 @@
 	vol->mftbmp_mapping.a_ops = NULL;
 	vol->mftbmp_mapping.host = NULL;
-	vol->mftbmp_mapping.i_mmap = NULL;
-	vol->mftbmp_mapping.i_mmap_shared = NULL;
+	INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap);
+	INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap_shared);
 	spin_lock_init(&vol->mftbmp_mapping.i_shared_lock);
 	INIT_RUN_LIST(&vol->mftbmp_rl);

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- types.h	4 Mar 2002 22:56:15 -0000	1.4
+++ types.h	5 Mar 2002 00:22:24 -0000	1.5
@@ -24,4 +24,12 @@
 #define _LINUX_NTFS_TYPES_H
 
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#define SN(X)   X	/* Struct Name */
+#define SC(P,N) P.N	/* ShortCut: Prefix, Name */
+#else
+#define SN(X)
+#define SC(P,N) N
+#endif
+
 /* 2-byte Unicode character type. */
 typedef u16 uchar_t;