[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs super.c,1.75,1.76

[Richard R. <fl...@us...>]

Changes by: flatcap

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

Modified Files:
	super.c 
Log Message:
quick fix to compile 2.5.4+


Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -U2 -r1.75 -r1.76
--- super.c	14 Feb 2002 06:12:27 -0000	1.75
+++ super.c	24 Feb 2002 20:05:02 -0000	1.76
@@ -1721,6 +1721,29 @@
 DECLARE_MUTEX(ntfs_lock);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
 static DECLARE_FSTYPE_DEV(ntfs_fs_type, "ntfs", ntfs_read_super);
+#else
+
+int ntfs_fill_super(struct super_block *sb, void *opt, int silent)
+{
+	if (ntfs_read_super(sb, opt, silent))
+		return 1;
+	else
+		return -EINVAL;
+}
+
+static struct super_block *ntfs_get_sb(struct file_system_type *fs_type,
+        int flags, char *dev_name, void *data)
+{
+	return get_sb_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);
+}
 
+static struct file_system_type ntfs_fs_type = {
+	owner:		THIS_MODULE,
+	name:		"ntfs",
+	get_sb:		ntfs_get_sb,
+	fs_flags:	FS_REQUIRES_DEV,
+};
+#endif /* VERSION >= 2.5.4 */
 static int __init init_ntfs_fs(void)
 {
@@ -1817,12 +1840,12 @@
 
 	if (kmem_cache_destroy(ntfs_big_inode_cache) && (err = 1))
-		printk(KERN_CRIT "NTFS: Failed to destory "
+		printk(KERN_CRIT "NTFS: Failed to destroy "
 				"ntfs_big_inode_cache.\n");
 	if (kmem_cache_destroy(ntfs_inode_cache) && (err = 1))
-		printk(KERN_CRIT "NTFS: Failed to destory ntfs_inode_cache.\n");
+		printk(KERN_CRIT "NTFS: Failed to destroy ntfs_inode_cache.\n");
 	if (kmem_cache_destroy(ntfs_name_cache) && (err = 1))
-		printk(KERN_CRIT "NTFS: Failed to destory ntfs_name_cache.\n");
+		printk(KERN_CRIT "NTFS: Failed to destroy ntfs_name_cache.\n");
 	if (kmem_cache_destroy(ntfs_attr_ctx_cache) && (err = 1))
-		printk(KERN_CRIT "NTFS: Failed to destory ntfs_actx_cache.\n");
+		printk(KERN_CRIT "NTFS: Failed to destroy ntfs_actx_cache.\n");
 	if (err)
 		printk(KERN_CRIT "NTFS: This causes memory to leak! There is "