1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
|
diff --new-file -ur linux-2.0.30-orig/fs/Config.in linux/fs/Config.in
--- linux-2.0.30-orig/fs/Config.in Sun Dec 1 08:58:05 1996
+++ linux/fs/Config.in Mon Sep 29 08:23:13 1997
@@ -37,6 +37,7 @@
fi
tristate 'ISO9660 cdrom filesystem support' CONFIG_ISO9660_FS
tristate 'OS/2 HPFS filesystem support (read only)' CONFIG_HPFS_FS
+tristate 'WinNT NTFS filesystem support (read only)' CONFIG_NTFS_FS
tristate 'System V and Coherent filesystem support' CONFIG_SYSV_FS
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate 'Amiga FFS filesystem support (EXPERIMENTAL)' CONFIG_AFFS_FS
diff --new-file -ur linux-2.0.30-orig/fs/Makefile linux/fs/Makefile
--- linux-2.0.30-orig/fs/Makefile Wed May 8 11:28:01 1996
+++ linux/fs/Makefile Mon Sep 29 08:23:13 1997
@@ -17,7 +17,7 @@
MOD_LIST_NAME := FS_MODULES
ALL_SUB_DIRS = minix ext ext2 fat msdos vfat proc isofs nfs xiafs umsdos \
- hpfs sysv smbfs ncpfs ufs affs
+ hpfs ntfs sysv smbfs ncpfs ufs affs
ifeq ($(CONFIG_QUOTA),y)
O_OBJS += dquot.o
@@ -138,6 +138,14 @@
else
ifeq ($(CONFIG_HPFS_FS),m)
MOD_SUB_DIRS += hpfs
+ endif
+endif
+
+ifeq ($(CONFIG_NTFS_FS),y)
+SUB_DIRS += ntfs
+else
+ ifeq ($(CONFIG_NTFS_FS),m)
+ MOD_SUB_DIRS += ntfs
endif
endif
diff --new-file -ur linux-2.0.30-orig/fs/filesystems.c linux/fs/filesystems.c
--- linux-2.0.30-orig/fs/filesystems.c Thu Apr 25 05:32:39 1996
+++ linux/fs/filesystems.c Mon Sep 29 08:23:13 1997
@@ -102,6 +102,10 @@
init_hpfs_fs();
#endif
+#ifdef CONFIG_NTFS_FS
+ init_ntfs_fs();
+#endif
+
#ifdef CONFIG_AFFS_FS
init_affs_fs();
#endif
diff --new-file -ur linux-2.0.30-orig/fs/ntfs/Makefile linux/fs/ntfs/Makefile
--- linux-2.0.30-orig/fs/ntfs/Makefile Fri Nov 1 17:46:00 1996
+++ linux/fs/ntfs/Makefile Mon Sep 29 18:26:15 1997
@@ -1,13 +1,8 @@
-# Make front end for the NTFS driver.
-# Replace with appropriate platform specific Makefile if desired
+# Makefile for the NTFS driver.
-all:
- @echo Please specify a platform: 'make linux' or 'make bsd'
+O_TARGET := ntfs.o
+O_OBJS := ntfs_fs.o inode.o dir.o super.o attr.o util.o
+M_OBJS := $(O_TARGET)
+EXTRA_CFLAGS += -D_LOOSE_KERNEL_NAMES
-linux:
- ln -s linux.mk makefile
- ${MAKE} ${MFLAGS}
-
-bsd:
- ln -s bsd.mk makefile
- ${MAKE} ${MFLAGS}
+include $(TOPDIR)/Rules.make
diff --new-file -ur linux-2.0.30-orig/fs/ntfs/config.h linux/fs/ntfs/config.h
--- linux-2.0.30-orig/fs/ntfs/config.h Wed Dec 31 19:00:00 1969
+++ linux/fs/ntfs/config.h Mon Sep 29 08:23:13 1997
@@ -0,0 +1 @@
+/*empty*/
diff --new-file -ur linux-2.0.30-orig/fs/ntfs/ntfs_fs.c linux/fs/ntfs/ntfs_fs.c
--- linux-2.0.30-orig/fs/ntfs/ntfs_fs.c Sat Aug 2 13:03:19 1997
+++ linux/fs/ntfs/ntfs_fs.c Wed Oct 1 20:55:21 1997
@@ -1088,6 +1088,7 @@
/* this is copied from linux/kernel/sysctl.c, because Linux 2.0 fails
to export it */
+#ifdef MODULE /* however, if compiled into the kernel, this is not needed */
int proc_dointvec(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp)
{
@@ -1162,6 +1163,7 @@
filp->f_pos += *lenp;
return 0;
}
+#endif /* MODULE */
#endif /* Linux 2.0 */
|