projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| f7e12df4 KT |
1 | diff -Naur linux-2.2.19/Documentation/Configure.help jfs-2.2.19-v1.0.4/Documentation/Configure.help |
| 2 | --- linux-2.2.19/Documentation/Configure.help Mon Sep 10 14:36:15 2001 | |
| 3 | +++ jfs-2.2.19-v1.0.4/Documentation/Configure.help Mon Sep 10 15:00:12 2001 | |
| 4 | @@ -10048,6 +10048,13 @@ | |
| 5 | ||
| 6 | If unsure, say N. | |
| 7 | ||
| 8 | +JFS filesystem support (EXPERIMENTAL) | |
| 9 | +CONFIG_JFS_FS | |
| 10 | + This is a port of IBM's Journaled Filesystem . JFS has only minimal | |
| 11 | + support on the 2.2 series of kernels. If you are truly interested in | |
| 12 | + JFS, consider moving to the latest 2.4 kernel. | |
| 13 | + If unsure, just say N. | |
| 14 | + | |
| 15 | /dev/pts filesystem for Unix98 PTYs | |
| 16 | CONFIG_DEVPTS_FS | |
| 17 | You should say Y here if you said Y to "Unix98 PTY support" above. | |
| 18 | diff -Naur linux-2.2.19/Documentation/filesystems/00-INDEX jfs-2.2.19-v1.0.4/Documentation/filesystems/00-INDEX | |
| 19 | --- linux-2.2.19/Documentation/filesystems/00-INDEX Mon Sep 10 14:36:15 2001 | |
| 20 | +++ jfs-2.2.19-v1.0.4/Documentation/filesystems/00-INDEX Mon Sep 10 15:00:12 2001 | |
| 21 | @@ -12,6 +12,8 @@ | |
| 22 | - info and mount options for the OS/2 HPFS. | |
| 23 | isofs.txt | |
| 24 | - info and mount options for the ISO 9660 (CDROM) filesystem. | |
| 25 | +jfs.txt | |
| 26 | + - info and mount options for the JFS filesystem. | |
| 27 | ncpfs.txt | |
| 28 | - info on Novell Netware(tm) filesystem using NCP protocol. | |
| 29 | ntfs.txt | |
| 30 | diff -Naur linux-2.2.19/MAINTAINERS jfs-2.2.19-v1.0.4/MAINTAINERS | |
| 31 | --- linux-2.2.19/MAINTAINERS Mon Sep 10 14:36:15 2001 | |
| 32 | +++ jfs-2.2.19-v1.0.4/MAINTAINERS Mon Sep 10 15:00:12 2001 | |
| 33 | @@ -596,6 +596,13 @@ | |
| 34 | W: http://www.melware.net | |
| 35 | S: Maintained | |
| 36 | ||
| 37 | +JFS FILESYSTEM | |
| 38 | +P: Dave Kleikamp | |
| 39 | +M: shaggy@austin.ibm.com | |
| 40 | +L: jfs-discussion@oss.software.ibm.com | |
| 41 | +W: http://oss.software.ibm.com/developerworks/opensource/jfs/ | |
| 42 | +S: Supported | |
| 43 | + | |
| 44 | JOYSTICK DRIVER | |
| 45 | P: Vojtech Pavlik | |
| 46 | M: vojtech@suse.cz | |
| 47 | diff -Naur linux-2.2.19/arch/i386/defconfig jfs-2.2.19-v1.0.4/arch/i386/defconfig | |
| 48 | --- linux-2.2.19/arch/i386/defconfig Mon Sep 10 14:36:15 2001 | |
| 49 | +++ jfs-2.2.19-v1.0.4/arch/i386/defconfig Mon Sep 10 15:00:12 2001 | |
| 50 | @@ -387,6 +387,7 @@ | |
| 51 | # CONFIG_VFAT_FS is not set | |
| 52 | CONFIG_ISO9660_FS=y | |
| 53 | # CONFIG_JOLIET is not set | |
| 54 | +# CONFIG_JFS_FS is not set | |
| 55 | # CONFIG_MINIX_FS is not set | |
| 56 | # CONFIG_NTFS_FS is not set | |
| 57 | # CONFIG_HPFS_FS is not set | |
| 58 | diff -Naur linux-2.2.19/fs/Config.in jfs-2.2.19-v1.0.4/fs/Config.in | |
| 59 | --- linux-2.2.19/fs/Config.in Mon Sep 10 14:36:15 2001 | |
| 60 | +++ jfs-2.2.19-v1.0.4/fs/Config.in Mon Sep 10 15:00:12 2001 | |
| 61 | @@ -79,6 +79,9 @@ | |
| 62 | define_bool CONFIG_SGI_PARTITION y | |
| 63 | fi | |
| 64 | fi | |
| 65 | +if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
| 66 | + tristate 'JFS filesystem support (experimental)' CONFIG_JFS_FS | |
| 67 | +fi | |
| 68 | ||
| 69 | if [ "$CONFIG_NET" = "y" ]; then | |
| 70 | ||
| 71 | diff -Naur linux.orig/fs/Makefile linux/fs/Makefile | |
| 40695033 KT |
72 | --- linux.orig/fs/Makefile Thu Nov 22 11:32:07 2001 |
| 73 | +++ linux/fs/Makefile Thu Nov 22 11:34:12 2001 | |
| f7e12df4 KT |
74 | @@ -18,7 +18,7 @@ |
| 75 | MOD_LIST_NAME := FS_MODULES | |
| 76 | ALL_SUB_DIRS = coda minix ext2 fat msdos vfat proc isofs nfs umsdos ntfs \ | |
| 77 | reiserfs \ | |
| 78 | - hpfs sysv smbfs ncpfs ufs affs romfs autofs hfs lockd \ | |
| 79 | + hpfs jfs sysv smbfs ncpfs ufs affs romfs autofs hfs lockd \ | |
| 40695033 | 80 | nfsd nls devpts adfs qnx4 udf efs |
| f7e12df4 KT |
81 | |
| 82 | ifeq ($(CONFIG_QUOTA),y) | |
| 83 | @@ -176,6 +176,14 @@ | |
| 84 | endif | |
| 85 | endif | |
| 86 | ||
| 87 | +ifeq ($(CONFIG_JFS_FS),y) | |
| 88 | +SUB_DIRS += jfs | |
| 89 | +else | |
| 90 | + ifeq ($(CONFIG_JFS_FS),m) | |
| 91 | + MOD_SUB_DIRS += jfs | |
| 92 | + endif | |
| 93 | +endif | |
| 94 | + | |
| 95 | ifeq ($(CONFIG_NTFS_FS),y) | |
| 96 | SUB_DIRS += ntfs | |
| 97 | else | |
| 98 | diff -Naur linux.orig/fs/filesystems.c linux/fs/filesystems.c | |
| 99 | --- linux.orig/fs/filesystems.c Wed Nov 21 11:00:30 2001 | |
| 100 | +++ linux/fs/filesystems.c Wed Nov 21 19:05:37 2001 | |
| 101 | @@ -28,6 +28,7 @@ | |
| 102 | #include <linux/qnx4_fs.h> | |
| 103 | #include <linux/udf_fs.h> | |
| 104 | #include <linux/ntfs_fs.h> | |
| 105 | +#include <linux/jfs_fs.h> | |
| 106 | #include <linux/hfs_fs.h> | |
| 107 | #include <linux/devpts_fs.h> | |
| 108 | #include <linux/reiserfs_fs.h> | |
| 109 | @@ -123,6 +123,10 @@ | |
| 110 | init_hpfs_fs(); | |
| 111 | #endif | |
| 112 | ||
| 113 | +#ifdef CONFIG_JFS_FS | |
| 114 | + init_jfs_fs(); | |
| 115 | +#endif | |
| 116 | + | |
| 117 | #ifdef CONFIG_NTFS_FS | |
| 118 | init_ntfs_fs(); | |
| 119 | #endif | |
| 120 | diff -Naur linux-2.2.19/fs/nls/Config.in jfs-2.2.19-v1.0.4/fs/nls/Config.in | |
| 121 | --- linux-2.2.19/fs/nls/Config.in Sun Mar 25 18:37:38 2001 | |
| 122 | +++ jfs-2.2.19-v1.0.4/fs/nls/Config.in Mon Sep 10 15:00:12 2001 | |
| 123 | @@ -5,7 +5,7 @@ | |
| 124 | # msdos and Joliet want NLS | |
| 125 | if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ | |
| 126 | -o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \ | |
| 127 | - -o "$CONFIG_SMB_FS" != "n" ]; then | |
| 128 | + -o "$CONFIG_SMB_FS" != "n" -o "$CONFIG_JFS_FS" != "n" ]; then | |
| 129 | define_bool CONFIG_NLS y | |
| 130 | else | |
| 131 | define_bool CONFIG_NLS n | |
| 132 | diff -Naur linux.orig/include/linux/fs.h linux/include/linux/fs.h | |
| 133 | --- linux.orig/include/linux/fs.h Wed Nov 21 11:00:30 2001 | |
| 134 | +++ linux/include/linux/fs.h Wed Nov 21 19:09:33 2001 | |
| 135 | @@ -287,6 +287,7 @@ | |
| 136 | #include <linux/qnx4_fs_i.h> | |
| 137 | #include <linux/reiserfs_fs_i.h> | |
| 138 | #include <linux/usbdev_fs_i.h> | |
| 139 | +#include <linux/jfs_fs_i.h> | |
| 140 | ||
| 141 | /* | |
| 142 | * Attribute flags. These should be or-ed together to figure out what | |
| 143 | @@ -407,6 +408,7 @@ | |
| 144 | struct udf_inode_info udf_i; | |
| 145 | struct reiserfs_inode_info reiserfs_i; | |
| 146 | struct usbdev_inode_info usbdev_i; | |
| 147 | + struct jfs_inode_info jfs_i; | |
| 148 | struct socket socket_i; | |
| 149 | struct beos_inode_info beos_i; | |
| 150 | void *generic_ip; | |
| 151 | @@ -529,6 +530,7 @@ | |
| 152 | #include <linux/qnx4_fs_sb.h> | |
| 153 | #include <linux/reiserfs_fs_sb.h> | |
| 154 | #include <linux/usbdev_fs_sb.h> | |
| 155 | +#include <linux/jfs_fs_sb.h> | |
| 156 | ||
| 157 | extern struct list_head super_blocks; | |
| 158 | ||
| 159 | @@ -574,6 +576,7 @@ | |
| 160 | struct qnx4_sb_info qnx4_sb; | |
| 161 | struct reiserfs_sb_info reiserfs_sb; | |
| 162 | struct usbdev_sb_info usbdevfs_sb; | |
| 163 | + struct jfs_sb_info jfs_sb; | |
| 164 | void *generic_sbp; | |
| 165 | } u; | |
| 166 | /* | |
| 167 | diff -Naur linux-2.2.19/kernel/ksyms.c jfs-2.2.19-v1.0.4/kernel/ksyms.c | |
| 168 | --- linux-2.2.19/kernel/ksyms.c Mon Sep 10 14:36:13 2001 | |
| 169 | +++ jfs-2.2.19-v1.0.4/kernel/ksyms.c Mon Sep 10 15:00:12 2001 | |
| 170 | @@ -377,6 +377,7 @@ | |
| 171 | EXPORT_SYMBOL(loops_per_jiffy); | |
| 172 | EXPORT_SYMBOL(kstat); | |
| 173 | EXPORT_SYMBOL(pidhash); | |
| 174 | +EXPORT_SYMBOL(wake_up_process); /* Needed to build JFS as module */ | |
| 175 | ||
| 176 | /* misc */ | |
| 177 | EXPORT_SYMBOL(panic); |