[PATCH] Linux-0.99 (December 13, 1992)

net-1: paranoid queue checking to find more bugs. configuration script version #1. NFS filesystem client support by Rick Sladkey! [Original announcement below] 0.99 has no major new features: the NFS client code is now in the standard distribution, and the kernel configuration has changed, but most of the rest of the changes are fixes - especially the tcp code should now be pretty stable (knock wood). Changes: - NFS is in. As are some stubs for the soud drivers, although it's only stubs right now. - various fixes around the place: the serial problems are hopefully gone, and there are patches to both TCP/IP and SCSI to make them more stable. - Minor fixes: the keyboard buglet introduced in 0.98pl6 should be gone, and some other bugs are also corrected. The optimized read-ahead code in the filesystems (and the raw device read code) was too complicated and seemed to have problems with bad blocks, so I rewrote it, and it should hopefully work correctly now (this may have been the reason "mkfs -c" didn't work in all cases). Thanks for some good bug-reports I've gotten: I've tried to correct all the problems I got reports on. - The kernel configuration has been re-thought: I decided to take advantage of the possibilities offered by GNU make etc. This means that you no longer can compile the kernel using any other make, but there probably aren't many (if any) people doing that anyway. This way I got rid of the extremely ugly SCSI setup, so it was probably worth it. To configure the kernel for your setup, do a make config and answer the yes/no questions. After that, do a make dep to make the dependencies match your setup. After that you should still go edit the top-level Makefile for some of the configuration information as before, but the remaining config things are pretty simple. Then you can make the kernel with a simple "make Image". The new configuration utility (essentially a stupid shell script coupled with some smarts in the Makefiles) tries to minimize compilations: if you disable the SCSI code the scsi drivers won't even be compiled, much less linked in. This should be a win on slower machines. NOTE!!! Use LILO-0.7 to load the 0.98pl5 and newer kernels: any older version of lilo is liable to result in weird problems. Linus

[PATCH] Linux-0.99 (December 13, 1992)
net-1: paranoid queue checking to find more bugs. configuration script version #1. NFS filesystem client support by Rick Sladkey! [Original announcement below] 0.99 has no major new features: the NFS client code is now in the standard distribution, and the kernel configuration has changed, but most of the rest of the changes are fixes - especially the tcp code should now be pretty stable (knock wood). Changes: - NFS is in. As are some stubs for the soud drivers, although it's only stubs right now. - various fixes around the place: the serial problems are hopefully gone, and there are patches to both TCP/IP and SCSI to make them more stable. - Minor fixes: the keyboard buglet introduced in 0.98pl6 should be gone, and some other bugs are also corrected. The optimized read-ahead code in the filesystems (and the raw device read code) was too complicated and seemed to have problems with bad blocks, so I rewrote it, and it should hopefully work correctly now (this may have been the reason "mkfs -c" didn't work in all cases). Thanks for some good bug-reports I've gotten: I've tried to correct all the problems I got reports on. - The kernel configuration has been re-thought: I decided to take advantage of the possibilities offered by GNU make etc. This means that you no longer can compile the kernel using any other make, but there probably aren't many (if any) people doing that anyway. This way I got rid of the extremely ugly SCSI setup, so it was probably worth it. To configure the kernel for your setup, do a make config and answer the yes/no questions. After that, do a make dep to make the dependencies match your setup. After that you should still go edit the top-level Makefile for some of the configuration information as before, but the remaining config things are pretty simple. Then you can make the kernel with a simple "make Image". The new configuration utility (essentially a stupid shell script coupled with some smarts in the Makefiles) tries to minimize compilations: if you disable the SCSI code the scsi drivers won't even be compiled, much less linked in. This should be a win on slower machines. NOTE!!! Use LILO-0.7 to load the 0.98pl5 and newer kernels: any older version of lilo is liable to result in weird problems. Linus
ad094925 · Linus Torvalds · c0cf5000 · ad094925 · ad094925 · ad094925
Commit ad094925 authored Nov 23, 2007 by Linus Torvalds
143 changed files
--- a/.config
+++ b/.config
+#
+# Automatically generated make config: don't edit
+#
+
+#
+# General setup
+#
+CONFIG_BLK_DEV_HD = CONFIG_BLK_DEV_HD
+CONFIG_TCPIP = CONFIG_TCPIP
+CONFIG_PROFILE = CONFIG_PROFILE
+CONFIG_MAX_16M = CONFIG_MAX_16M
+
+#
+# SCSI support
+#
+
+#
+# SCSI support type (disk, tape, CDrom)
+#
+
+#
+# SCSI low-level drivers
+#
+
+#
+# Filesystems
+#
+CONFIG_MINIX_FS = CONFIG_MINIX_FS
+CONFIG_PROC_FS = CONFIG_PROC_FS
+
+#
+# Various character device drivers..
+#
--- a/.depend
+++ b/.depend
+init/main.o : init/main.c /usr/lib/gcc-lib/i386-linux/2.3.2/include/stdarg.h /usr/include/asm/system.h \
+  /usr/include/asm/io.h /usr/include/linux/mktime.h /usr/include/linux/types.h \
+  /usr/include/linux/fcntl.h /usr/include/linux/config.h /usr/include/linux/autoconf.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/linux/unistd.h \
+  /usr/include/linux/string.h 
--- a/.version
+++ b/.version
-40
+44
--- a/Configure
+++ b/Configure
+#! /bin/sh
+#
+# This script is used to configure the linux kernel.
+# It's a fast hack - feel free to do something better.
+CONFIG=.config
+CONFIG_H=include/linux/autoconf.h
+echo "#" > $CONFIG
+echo "# Automatically generated make config: don't edit" >> $CONFIG
+echo "#" >> $CONFIG
+
+echo "/*" > $CONFIG_H
+echo " * Automatically generated C config: don't edit" >> $CONFIG_H
+echo " */" >> $CONFIG_H
+
+next="y"
+old="y"
+
+while read i
+do
+	echo >> $CONFIG
+	echo >> $CONFIG_H
+	echo
+	echo "#" >> $CONFIG
+	echo "/*" >> $CONFIG_H
+	echo "**"
+	while [ "$i" != "." -a "$i" != ":" ]
+	do
+		echo "# "$i >> $CONFIG
+		echo " * "$i >> $CONFIG_H
+		echo "**" $i
+		read i || break
+	done
+	echo "#" >> $CONFIG
+	echo " */" >> $CONFIG_H
+	echo "**"
+	read i || break
+	while [ "$i" != "." -a "$i" != ":" ]
+	do
+		read j ques def || break
+		if [ "$old" = "n" ]
+		then
+			echo No $i
+			ans="n"
+		else
+			echo -n $i '('$ques', default='$def')? '
+			read ans < /dev/tty
+			if [ "$ans" = "" ]
+			then
+				ans=$def
+			fi
+		fi
+		if [ "$ans" = "y" ]
+		then
+			echo $j = $j >> $CONFIG
+			echo "#define" $j 1 >> $CONFIG_H
+			next="y";
+		fi
+		read i || break
+	done
+	old=$next
+	next="y"
+	if [ "$i" = ":" ]
+	then
+		next="n"
+	fi
+done
+
+echo
+echo "The linux kernel is now hopefully configured for your setup."
+echo "Check the top-level Makefile for additional configuration,"
+echo "and do a 'make dep ; make clean' if you want to be sure all"
+echo "the files are correctly re-made"
+echo
+
+exit 0
--- a/Makefile
+++ b/Makefile
+include .config
+
 #
 # ROOT_DEV specifies the default root-device when making the image.
 # This can be either FLOPPY, /dev/xxxx or empty, in which case the
@@ -6,13 +8,6 @@

 ROOT_DEV = /dev/hdb1

-#
-# uncomment this if you want kernel profiling: the profile_shift is the
-# granularity of the profiling (5 = 32-byte granularity)
-#
-
-PROFILING =# -DPROFILE_SHIFT=2
-
 #
 # uncomment the correct keyboard:
 #
@@ -47,24 +42,6 @@ KEYBOARD = -DKBD_FINNISH -DKBDFLAGS=0
 # KEYBOARD = -DKBD_SF_LATIN1 -DKBDFLAGS=0x9F
 # KEYBOARD = -DKBD_NO -DKBDFLAGS=0

-#
-# comment this line if you don't want the emulation-code
-#
-
-MATH_EMULATION = -DKERNEL_MATH_EMULATION
-
-#
-# Comment out this line if you don't want the 16MB kernel limit - but
-# note that some of the SCSI drivers may have problems with anything
-# else due to DMA limits.  The drivers should check, but they don't.
-#
-# EVEN IF YOU HAVE > 16MB, YOU SHOULD EDIT THIS ONLY IF YOU ARE 100%
-# SURE YOU AREN'T USING ANY DEVICE THAT DOES UNCHECKED DMA!!  THE
-# FLOPPY DRIVER IS OK, BUT OTHERS MIGHT HAVE PROBLEMS.
-#
-
-LIMIT_MEMORY = -DMAX_16M
-
 #
 # If you want to preset the SVGA mode, uncomment the next line and
 # set SVGA_MODE to whatever number you want.
@@ -74,11 +51,23 @@ LIMIT_MEMORY = -DMAX_16M

 SVGA_MODE=	-DSVGA_MODE=1

+# 
+# Edit the SOUND_SUPPORT line to suit your setup if you have configured
+# the sound driver to be in the kernel (not really there yet).
+#
+# The DSP_BUFFSIZE defines size of the DMA buffer used for PCM voice I/O. 
+# You should use one of the values 4096 (SB), 16384 (SB Pro), 32768 (PAS+) 
+# or 65536 (PAS16). The SBC_IRQ defines the IRQ line used by SoundBlaster and
+# the PAS_IRQ is the IRQ number for ProAudioSpectrum.
+# NOTE! The ProAudioSpectrum support is not available yet.
+
+SOUND_SUPPORT = -DKERNEL_SOUNDCARD -DDSP_BUFFSIZE=16384 -DSBC_IRQ=7 -DPAS_IRQ=5
+
 #
 # standard CFLAGS
 #

-CFLAGS = -Wall -O6 -fomit-frame-pointer $(LIMIT_MEMORY)
+CFLAGS = -Wall -O6 -fomit-frame-pointer

 #
 # if you want the ram-disk device, define this to be the
@@ -95,13 +84,13 @@ LD	=ld
 HOSTCC	=gcc
 CC	=gcc -DKERNEL
 MAKE	=make
-CPP	=$(CC) -E $(LIMIT_MEMORY)
+CPP	=$(CC) -E
 AR	=ar

 ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o net/net.o
 FILESYSTEMS	=fs/filesystems.a
 DRIVERS		=kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a \
-		 kernel/blk_drv/scsi/scsi.a
+		 kernel/blk_drv/scsi/scsi.a kernel/chr_drv/sound/sound.a
 MATH		=kernel/FPU-emu/math.a
 LIBS		=lib/lib.a
 SUBDIRS		=kernel mm fs net lib
@@ -122,12 +111,15 @@ lilo: Image
 	cat Image > /vmlinux
 	/etc/lilo/install

+config:
+	sh Configure < config.in
+
 linuxsubdirs: dummy
 	@for i in $(SUBDIRS); do (cd $$i && echo $$i && $(MAKE)) || exit; done

 Version:
 	@./makever.sh
-	@echo \#define UTS_RELEASE \"0.98.pl6-`cat .version`\" > tools/version.h
+	@echo \#define UTS_RELEASE \"0.99-`cat .version`\" > tools/version.h
 	@echo \#define UTS_VERSION \"`date +%D`\" >> tools/version.h
 	@echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> tools/version.h
 	@echo \#define LINUX_COMPILE_BY \"`whoami`\" >> tools/version.h
@@ -190,7 +182,7 @@ kernel: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=kernel

 clean:
-	rm -f Image System.map tmp_make core boot/bootsect boot/setup \
+	rm -f Image System.map core boot/bootsect boot/setup \
 		boot/bootsect.s boot/setup.s boot/head.s init/main.s
 	rm -f init/*.o tools/system tools/build boot/*.o tools/*.o
 	for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean); done
@@ -200,24 +192,14 @@ backup: clean
 	sync

 depend dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	for i in init/*.c;do echo -n "init/";$(CPP) -M $$i;done >> tmp_make
-	cp tmp_make Makefile
+	for i in init/*.c;do echo -n "init/";$(CPP) -M $$i;done > .depend
 	for i in $(SUBDIRS); do (cd $$i && $(MAKE) dep) || exit; done

 dummy:

-### Dependencies:
-init/main.o : init/main.c /usr/lib/gcc-lib/i386-linux/2.3.2/include/stdarg.h /usr/include/asm/system.h \
-  /usr/include/asm/io.h /usr/include/linux/mktime.h /usr/include/linux/types.h \
-  /usr/include/linux/fcntl.h /usr/include/linux/config.h /usr/include/linux/config.dist.h \
-  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/linux/unistd.h \
-  /usr/include/linux/string.h 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/README
+++ b/README
@@ -29,16 +29,8 @@ toplevel kernel source directory.
 * Basic configuration

 1.  Edit Makefile: Check the definitions of macros ROOTDEV, KEYBOARD,
-MATH_EMULATION, RAMDISK and SVGA_MODE before you run make.  They are
-explained in the Makefile.  MATH_EMULATION does not hurt much even if
-you have an FPU (387 or a 486 with a built in FPU), since Linux uses
-the FPU if it finds one, even with MATH_EMULATION defined.  The kernel
-will be slightly bigger.  It is probably not worth it to recompile the
-kernel just to get rid of the emulation.
-
-[ Linus' note: the new math-emulator in 0.98.2 is much better than my
-  old one, but it also takes up more memory.  You may want to remove it
-  if you are short on memory and long on math-coprocessors ]
+RAMDISK and SVGA_MODE before you run make.  They are explained in the
+Makefile.

 2.  Create the symlinks:

@@ -53,54 +45,19 @@ get some system-specific information.
  installation script, so if you have the new compiler, you should
  already have these links ]

-* Things you may want to get rid of
-
-3.  To remove SCSI drivers, do this:
-
-	- remove kernel/blk_drv/scsi/scsi.a from DRIVERS in the Makefile
-	- remove the commands for the subdirs dependency in
-	  kernel/blk_drv/Makefile
-	- add "#undef CONFIG_SCSI" to the end of include/linux/config.h
-
-The SCSI drivers take a bit of memory, and also slow the bootup a bit,
-so you may want to get rid of them if you don't have an SCSI drive.
-
-4.  The kernel contains code for the extended filesystem (extfs),
-MS-DOS filesystem (dosfs) and proc-fs (proc), all of which are in
-testing phases and are not recommended for real use yet.  If you don't
-want to include these in the kernel, do the following:
-
-	- remove references to these in the FILESYSTEMS macro in the
-	  root Makefile 
-	- remove directory names from the SUBDIRS macro in fs/Makefile
-	- remove the corresponding lines in the initialization of
-	  file_systems in fs/super.c.
-
-5.  The TCP/IP code is in the standard sources as of version 0.98, but
-it is not compiled into the normal binary. To get TCP/IP working, you
-have to:
-
-	- edit 'net/Makefile', defining the SUBDIRS and SOCK_FLAGS
-	  variables correctly (currently commented out).  Likewise, you
-	  have to edit the rule for linking net.o in the Makefile (again
-	  removing a '#' to make tcp/tcpip.o active)
-	- make sure you have the /usr/include/netinet/protocols.h header
-	  file.  If you don't have it, you should be able to find it at
-	  the same place you got the kernel, or with a newer compiler
-	  version.
-	- remove all object (*.o) files in the net/ subdirectory, making
-	  sure that they are recompiled with the correct Makefile
-	  definitions.
-	- Additionally, you obviously need the tcp/ip programs to make any
-	  use of the kernel feature.  If you haven't joined the TCP/IP
-	  mailing list, do so. 
+3.  Run "make config" in /usr/src/linux, and answer the questions that
+the config script asks you.  It should hopefully set up most of the rest
+of the flags for your system. 

+4.  Run "make dep" to set up all the dependencies correctly.  The
+default dependencies may not fit your system due to different compiler
+versions or similar. 

 * Running make

 [ Linus' note3: if you have problems with make not working correctly,
-  get a new copy of GNU make. pmake may or may not work due to the
-  macro inheritation assumptions etc ]
+  get a new copy of GNU make. The linux kernel makefiles are written
+  for GNU make and will not work for anything else ]

 Unless you know what you're doing, don't ever run the makefiles in
 subdirectories by hand.  There is a bit of interaction between the

--- a/boot/setup.S
+++ b/boot/setup.S
@@ -233,17 +233,25 @@ end_move:
 	jmpi	0,8		! jmp offset 0 of segment 8 (cs)

 ! This routine checks that the keyboard command queue is empty
+! (after emptying the output buffers)
+!
 ! No timeout is used - if this hangs there is something wrong with
 ! the machine, and we probably couldn't proceed anyway.
 empty_8042:
 	.word	0x00eb,0x00eb
 	in	al,#0x64	! 8042 status port
+	test	al,#1		! output buffer?
+	jz	no_output
+	.word	0x00eb,0x00eb
+	in	al,#0x60	! read it
+	jmp	empty_8042
+no_output:
 	test	al,#2		! is input buffer full?
 	jnz	empty_8042	! yes - loop
 	ret

 getkey:
-	in	al,#0x60	! Quick and dirty...
+	in	al,#0x60		! Quick and dirty...
 	.word	0x00eb,0x00eb		! jmp $+2, jmp $+2
 	mov	bl,al
 	in	al,#0x61

--- a/config.in
+++ b/config.in
+General setup
+.
+Kernel math emulation
+CONFIG_MATH_EMULATION y/n n
+Normal harddisk support
+CONFIG_BLK_DEV_HD y/n y
+TCP/IP
+CONFIG_TCPIP y/n y
+Kernel profiling support
+CONFIG_PROFILE y/n n
+Limit to memory to low 16MB
+CONFIG_MAX_16M y/n y
+:
+SCSI support
+.
+SCSI support?
+CONFIG_SCSI y/n n
+:
+SCSI support type (disk, tape, CDrom)
+.
+Scsi disk support
+CONFIG_BLK_DEV_SD y/n y
+Scsi tape support
+CONFIG_BLK_DEV_ST y/n y
+Scsi CDROM support
+CONFIG_BLK_DEV_SR y/n y
+.
+SCSI low-level drivers
+.
+Adaptek AHA1542 support
+CONFIG_SCSI_AHA1542 y/n y
+Adaptek AHA1740 support
+CONFIG_SCSI_AHA1740 y/n y
+Always IN support
+CONFIG_SCSI_ALWAYS y/n y
+Future Domain SCSI support
+CONFIG_SCSI_FUTURE_DOMAIN y/n y
+Seagate ST-02 SCSI support
+CONFIG_SCSI_SEAGATE y/n y
+UltraStor SCSI support
+CONFIG_SCSI_ULTRASTOR y/n y
+7000FASST SCSI support
+CONFIG_SCSI_7000FASST y/n y
+.
+Filesystems
+.
+Standard (minix) fs support
+CONFIG_MINIX_FS y/n y
+Extended fs support
+CONFIG_EXT_FS y/n n
+msdos fs support
+CONFIG_MSDOS_FS y/n n
+/proc filesystem support
+CONFIG_PROC_FS y/n y
+NFS filesystem support
+CONFIG_NFS_FS y/n n
+ISO9660 cdrom filesystem support
+CONFIG_ISO9660_FS y/n n
+.
+Various character device drivers..
+.
+Autoconfigure serial IRQ lines at bootup
+CONFIG_AUTOIRQ y/n n
+AST Fourport serial driver support
+CONFIG_AST_FOURPORT y/n n
+Accent Async 4 serial support
+CONFIG_ACCENT_ASYNC y/n n
+Logitech busmouse support
+CONFIG_BUSMOUSE y/n n
+PS/2 mouse (aka 'auxilliary device') support
+CONFIG_PSMOUSE y/n n
+MicroSoft busmouse support
+CONFIG_MS_BUSMOUSE y/n n
+ATIXL busmouse support
+CONFIG_ATIXL_BUSMOUSE y/n n
+Soundcard support (not really there yet)
+CONFIG_SOUND y/n n
--- a/fs/.depend
+++ b/fs/.depend
--- a/fs/Makefile
+++ b/fs/Makefile
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -59,42 +59,46 @@ int block_write(struct inode * inode, struct file * filp, char * buf, int count)

 #define NBUF 16

-
 int block_read(struct inode * inode, struct file * filp, char * buf, int count)
 {
-	unsigned int block = filp->f_pos >> BLOCK_SIZE_BITS;
-	unsigned int offset = filp->f_pos & (BLOCK_SIZE-1);
+	unsigned int block;
+	unsigned int offset;
 	int blocks, left;
-	int bhrequest;
-	int ra_blocks, max_block, nextblock;
+	int bhrequest, uptodate;
 	struct buffer_head ** bhb, ** bhe;
 	struct buffer_head * buflist[NBUF];
 	struct buffer_head * bhreq[NBUF];
 	unsigned int chars;
 	unsigned int size;
 	unsigned int dev;
-	int read = 0;
+	int read;

 	dev = inode->i_rdev;
+	offset = filp->f_pos;
 	if (blk_size[MAJOR(dev)])
 		size = blk_size[MAJOR(dev)][MINOR(dev)] << BLOCK_SIZE_BITS;
 	else
 		size = 0x7fffffff;

-	if (filp->f_pos > size)
+	if (offset > size)
 		left = 0;
 	else
-		left = size - filp->f_pos;
+		left = size - offset;
 	if (left > count)
 		left = count;
 	if (left <= 0)
 		return 0;
-
-	blocks = (left + offset + BLOCK_SIZE - 1) / BLOCK_SIZE;
+	read = 0;
+	block = offset >> BLOCK_SIZE_BITS;
+	offset &= BLOCK_SIZE-1;
+	size >>= BLOCK_SIZE_BITS;
+	blocks = (left + offset + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS;
 	bhb = bhe = buflist;
-	ra_blocks = read_ahead[MAJOR(dev)] / (BLOCK_SIZE >> 9);
-	max_block = size;
-	nextblock = -1;
+	if (filp->f_reada) {
+		blocks += read_ahead[MAJOR(dev)] / (BLOCK_SIZE >> 9);
+		if (block + blocks > size)
+			blocks = size - block;
+	}

 	/* We do this in a two stage process.  We first try and request
 	   as many blocks as we can, then we wait for the first one to
@@ -108,103 +112,67 @@ int block_read(struct inode * inode, struct file * filp, char * buf, int count)

 	do {
 	        bhrequest = 0;
+	        uptodate = 1;
 		while (blocks) {
-		        int uptodate;
 			--blocks;
 			*bhb = getblk(dev, block++, BLOCK_SIZE);
-			uptodate = 1;
 			if (*bhb && !(*bhb)->b_uptodate) {
 			        uptodate = 0;
 			        bhreq[bhrequest++] = *bhb;
-				nextblock = (*bhb)->b_blocknr + 1;
-			      };
+			}

 			if (++bhb == &buflist[NBUF])
 				bhb = buflist;

 			/* If the block we have on hand is uptodate, go ahead
 			   and complete processing. */
-			if(bhrequest == 0 && uptodate) break;
-
+			if (uptodate)
+				break;
 			if (bhb == bhe)
 				break;
-		      }
-
-		if(blocks == 0 && bhrequest && filp->f_reada && bhb != bhe) { 
-		  /* If we are going to read something anyways, add in the
-		     read-ahead blocks */
-		  while(ra_blocks){
-		    if (block >= max_block) break;
-		    if(bhrequest == NBUF) break;  /* Block full */
-		    --ra_blocks;
-		    *bhb = getblk(dev, block++, BLOCK_SIZE);
-
-		    if (*bhb && !(*bhb)->b_uptodate) {
-		      if((*bhb)->b_blocknr != nextblock) {
-			brelse(*bhb);
-			break;
-		      };
-		      nextblock = (*bhb)->b_blocknr + 1;
-		      bhreq[bhrequest++] = *bhb;
-		    };
-		    
-		    if (++bhb == &buflist[NBUF])
-		      bhb = buflist;
-		    
-		    if (bhb == bhe)
-		      break;
-		  };
-		};
+		}
+
 		/* Now request them all */
 		if (bhrequest)
-		  ll_rw_block(READ, bhrequest, bhreq);
-
-		do{ /* Finish off all I/O that has actually completed */
-		  if (*bhe) {/* test for valid buffer */
-		    wait_on_buffer(*bhe);
-		    if (!(*bhe)->b_uptodate) {
-		      do {
-			brelse(*bhe);
+			ll_rw_block(READ, bhrequest, bhreq);
+
+		do { /* Finish off all I/O that has actually completed */
+			if (*bhe) {
+				wait_on_buffer(*bhe);
+				if (!(*bhe)->b_uptodate) {	/* read error? */
+					left = 0;
+					break;
+				}
+			}			
+			if (left < BLOCK_SIZE - offset)
+				chars = left;
+			else
+				chars = BLOCK_SIZE - offset;
+			filp->f_pos += chars;
+			left -= chars;
+			read += chars;
+			if (*bhe) {
+				memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
+				brelse(*bhe);
+				buf += chars;
+			} else {
+				while (chars-->0)
+					put_fs_byte(0,buf++);
+			}
+			offset = 0;
 			if (++bhe == &buflist[NBUF])
-			  bhe = buflist;
-		      } while (bhe != bhb);
-		      break;
-		    }
-		  }
-		  
-		  if (left < BLOCK_SIZE - offset)
-		    chars = left;
-		  else
-		    chars = BLOCK_SIZE - offset;
-		  filp->f_pos += chars;
-		  left -= chars;
-		  read += chars;
-		  if (*bhe) {
-		    memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
-		    brelse(*bhe);
-		    buf += chars;
-		  } else {
-		    while (chars-->0)
-		      put_fs_byte(0,buf++);
-		  }
-		  offset = 0;
-		  if (++bhe == &buflist[NBUF])
-		    bhe = buflist;
-		} while( bhe != bhb && (*bhe == 0 || !(*bhe)->b_lock) && 
-			(left > 0));
+				bhe = buflist;
+		} while (left > 0 && bhe != bhb && (!*bhe || !(*bhe)->b_lock));
 	} while (left > 0);

 /* Release the read-ahead blocks */
 	while (bhe != bhb) {
-	  if (*bhe) brelse(*bhe);
-	  if (++bhe == &buflist[NBUF])
-	    bhe = buflist;
+		brelse(*bhe);
+		if (++bhe == &buflist[NBUF])
+			bhe = buflist;
 	};
-
-	filp->f_reada = 1;
-
 	if (!read)
 		return -EIO;
-
+	filp->f_reada = 1;
 	return read;
 }
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -314,7 +314,7 @@ struct buffer_head * getblk(dev_t dev, int block, int size)
 		return bh;
 	}

-	if (nr_free_pages > 30)
+	if (nr_free_pages > 30 && buffermem < 6*1024*1024)
 		grow_buffers(size);

 	buffers = nr_buffers;

--- a/fs/exec.c
+++ b/fs/exec.c
@@ -243,16 +243,19 @@ static unsigned long * create_tables(char * p,int argc,int envc)
 	put_fs_long((unsigned long)envp,--sp);
 	put_fs_long((unsigned long)argv,--sp);
 	put_fs_long((unsigned long)argc,--sp);
+	current->arg_start = (unsigned long) p;
 	while (argc-->0) {
 		put_fs_long((unsigned long) p,argv++);
 		while (get_fs_byte(p++)) /* nothing */ ;
 	}
 	put_fs_long(0,argv);
+	current->arg_end = current->env_start = (unsigned long) p;
 	while (envc-->0) {
 		put_fs_long((unsigned long) p,envp++);
 		while (get_fs_byte(p++)) /* nothing */ ;
 	}
 	put_fs_long(0,envp);
+	current->env_end = (unsigned long) p;
 	return sp;
 }


--- a/fs/ext/.depend
+++ b/fs/ext/.depend
+blkdev.o : blkdev.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/tty.h \
+  /usr/include/linux/termios.h /usr/include/asm/system.h /usr/include/linux/stat.h \
+  /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
+chrdev.o : chrdev.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/tty.h \
+  /usr/include/linux/termios.h /usr/include/asm/system.h /usr/include/linux/stat.h \
+  /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
+dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/kernel.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/ext_fs.h /usr/include/linux/stat.h 
+fifo.o : fifo.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h 
+file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/ext_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h 
+freelists.o : freelists.c /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h \
+  /usr/include/linux/stat.h /usr/include/linux/string.h /usr/include/linux/locks.h 
+inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
+  /usr/include/asm/segment.h 
+namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
+  /usr/include/asm/segment.h 
+symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/stat.h 
+truncate.o : truncate.c /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
--- a/fs/ext/Makefile
+++ b/fs/ext/Makefile
@@ -21,114 +21,14 @@ ext.o: $(OBJS)
 	$(LD) -r -o ext.o $(OBJS)

 clean:
-	rm -f core *.o *.a tmp_make
-	for i in *.c;do rm -f `basename $$i .c`.s;done
+	rm -f core *.s *.o *.a

 dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	$(CPP) -M *.c >> tmp_make
-	cp tmp_make Makefile
+	$(CPP) -M *.c > .depend

-### Dependencies:
-blkdev.o : blkdev.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/tty.h \
-  /usr/include/linux/termios.h /usr/include/asm/system.h /usr/include/linux/stat.h \
-  /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
-chrdev.o : chrdev.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/tty.h \
-  /usr/include/linux/termios.h /usr/include/asm/system.h /usr/include/linux/stat.h \
-  /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
-dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/kernel.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/ext_fs.h /usr/include/linux/stat.h 
-fifo.o : fifo.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h 
-file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/ext_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h 
-freelists.o : freelists.c /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h \
-  /usr/include/linux/stat.h /usr/include/linux/string.h /usr/include/linux/locks.h 
-inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
-  /usr/include/asm/segment.h 
-namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
-  /usr/include/asm/segment.h 
-symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
-  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h /usr/include/linux/stat.h 
-truncate.o : truncate.c /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/ext_fs.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/ext/file.c
+++ b/fs/ext/file.c
@@ -71,37 +71,41 @@ static int ext_file_read(struct inode * inode, struct file * filp, char * buf, i
 {
 	int read,left,chars;
 	int block, blocks, offset;
-	int bhrequest;
-	int ra_blocks, max_block, nextblock;
+	int bhrequest, uptodate;
 	struct buffer_head ** bhb, ** bhe;
 	struct buffer_head * bhreq[NBUF];
 	struct buffer_head * buflist[NBUF];
+	unsigned int size;

 	if (!inode) {
 		printk("ext_file_read: inode = NULL\n");
 		return -EINVAL;
 	}
-	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) {
+	if (!S_ISREG(inode->i_mode)) {
 		printk("ext_file_read: mode = %07o\n",inode->i_mode);
 		return -EINVAL;
 	}
-	if (filp->f_pos > inode->i_size)
+	offset = filp->f_pos;
+	size = inode->i_size;
+	if (offset > size)
 		left = 0;
 	else
-		left = inode->i_size - filp->f_pos;
+		left = size - offset;
 	if (left > count)
 		left = count;
 	if (left <= 0)
 		return 0;
 	read = 0;
-	block = filp->f_pos >> BLOCK_SIZE_BITS;
-	offset = filp->f_pos & (BLOCK_SIZE-1);
-	blocks = (left + offset + BLOCK_SIZE - 1) / BLOCK_SIZE;
+	block = offset >> BLOCK_SIZE_BITS;
+	offset &= BLOCK_SIZE-1;
+	size = (size + (BLOCK_SIZE-1)) >> BLOCK_SIZE_BITS;
+	blocks = (left + offset + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS;
 	bhb = bhe = buflist;
-
-	ra_blocks = read_ahead[MAJOR(inode->i_dev)] / (BLOCK_SIZE >> 9);
-	max_block = (inode->i_size + BLOCK_SIZE - 1)/BLOCK_SIZE;
-	nextblock = -1;
+	if (filp->f_reada) {
+		blocks += read_ahead[MAJOR(inode->i_dev)] / (BLOCK_SIZE >> 9);
+		if (block + blocks > size)
+			blocks = size - block;
+	}

 	/* We do this in a two stage process.  We first try and request
 	   as many blocks as we can, then we wait for the first one to
@@ -115,103 +119,68 @@ static int ext_file_read(struct inode * inode, struct file * filp, char * buf, i

 	do {
 	        bhrequest = 0;
+	        uptodate = 1;
 		while (blocks) {
-		        int uptodate;
 			--blocks;
 			*bhb = ext_getblk(inode, block++, 0);
-			uptodate = 1;
 			if (*bhb && !(*bhb)->b_uptodate) {
 			        uptodate = 0;
 			        bhreq[bhrequest++] = *bhb;
-				nextblock = (*bhb)->b_blocknr + 1;
-			      };
+			}

 			if (++bhb == &buflist[NBUF])
 				bhb = buflist;

 			/* If the block we have on hand is uptodate, go ahead
 			   and complete processing. */
-			if(bhrequest == 0 && uptodate) break;
-
+			if (uptodate)
+				break;
 			if (bhb == bhe)
 				break;
-		      }
-
-		if(blocks == 0 && bhrequest && filp->f_reada && bhb != bhe) { 
-		  /* If we are going to read something anyways, add in the
-		     read-ahead blocks */
-		  while(ra_blocks){
-		    if (block >= max_block) break;
-		    if(bhrequest == NBUF) break;  /* Block full */
-		    --ra_blocks;
-		    *bhb = ext_getblk(inode, block++, 0);
+		}

-		    if (*bhb && !(*bhb)->b_uptodate) {
-		      if((*bhb)->b_blocknr != nextblock) {
-			brelse(*bhb);
-			break;
-		      };
-		      nextblock = (*bhb)->b_blocknr + 1;
-		      bhreq[bhrequest++] = *bhb;
-		    };
-		    
-		    if (++bhb == &buflist[NBUF])
-		      bhb = buflist;
-		    
-		    if (bhb == bhe)
-		      break;
-		  };
-		};
 		/* Now request them all */
 		if (bhrequest)
-		  ll_rw_block(READ, bhrequest, bhreq);
-
-		do{ /* Finish off all I/O that has actually completed */
-		  if (*bhe) {/* test for valid buffer */
-		    wait_on_buffer(*bhe);
-		    if (!(*bhe)->b_uptodate) {
-		      do {
-			brelse(*bhe);
+			ll_rw_block(READ, bhrequest, bhreq);
+
+		do { /* Finish off all I/O that has actually completed */
+			if (*bhe) {
+				wait_on_buffer(*bhe);
+				if (!(*bhe)->b_uptodate) {	/* read error? */
+					left = 0;
+					break;
+				}
+			}
+			if (left < BLOCK_SIZE - offset)
+				chars = left;
+			else
+				chars = BLOCK_SIZE - offset;
+			filp->f_pos += chars;
+			left -= chars;
+			read += chars;
+			if (*bhe) {
+				memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
+				brelse(*bhe);
+				buf += chars;
+			} else {
+				while (chars-->0)
+					put_fs_byte(0,buf++);
+			}
+			offset = 0;
 			if (++bhe == &buflist[NBUF])
-			  bhe = buflist;
-		      } while (bhe != bhb);
-		      break;
-		    }
-		  }
-		  
-		  if (left < BLOCK_SIZE - offset)
-		    chars = left;
-		  else
-		    chars = BLOCK_SIZE - offset;
-		  filp->f_pos += chars;
-		  left -= chars;
-		  read += chars;
-		  if (*bhe) {
-		    memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
-		    brelse(*bhe);
-		    buf += chars;
-		  } else {
-		    while (chars-->0)
-		      put_fs_byte(0,buf++);
-		  }
-		  offset = 0;
-		  if (++bhe == &buflist[NBUF])
-		    bhe = buflist;
-		} while( bhe != bhb && (*bhe == 0 || !(*bhe)->b_lock) && 
-			(left > 0));
+				bhe = buflist;
+		} while (left > 0 && bhe != bhb && (!*bhe || !(*bhe)->b_lock));
 	} while (left > 0);

 /* Release the read-ahead blocks */
 	while (bhe != bhb) {
-	  if (*bhe) brelse(*bhe);
-	  if (++bhe == &buflist[NBUF])
-	    bhe = buflist;
+		brelse(*bhe);
+		if (++bhe == &buflist[NBUF])
+			bhe = buflist;
 	};
-
-	filp->f_reada = 1;
-
 	if (!read)
 		return -EIO;
+	filp->f_reada = 1;
 	if (!IS_RDONLY(inode)) {
 		inode->i_atime = CURRENT_TIME;
 		inode->i_dirt = 1;

--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -8,42 +8,42 @@

 #include <linux/config.h>
 #include <linux/fs.h>
-#ifdef MINIX_FS
+#ifdef CONFIG_MINIX_FS
 #include <linux/minix_fs.h>
 #endif
-#ifdef PROC_FS
+#ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
 #endif
-#ifdef EXT_FS
+#ifdef CONFIG_EXT_FS
 #include <linux/ext_fs.h>
 #endif
-#ifdef MSDOS_FS
+#ifdef CONFIG_MSDOS_FS
 #include <linux/msdos_fs.h>
 #endif
-#ifdef NFS_FS
+#ifdef CONFIG_NFS_FS
 #include <linux/nfs_fs.h>
 #endif
-#ifdef ISO9660_FS
+#ifdef CONFIG_ISO9660_FS
 #include <linux/iso_fs.h>
 #endif

 struct file_system_type file_systems[] = {
-#ifdef MINIX_FS
+#ifdef CONFIG_MINIX_FS
 	{minix_read_super,	"minix",	1},
 #endif
-#ifdef EXT_FS
+#ifdef CONFIG_EXT_FS
 	{ext_read_super,	"ext",		1},
 #endif
-#ifdef MSDOS_FS
+#ifdef CONFIG_MSDOS_FS
 	{msdos_read_super,	"msdos",	1},
 #endif
-#ifdef PROC_FS
+#ifdef CONFIG_PROC_FS
 	{proc_read_super,	"proc",		0},
 #endif
-#ifdef NFS_FS
+#ifdef CONFIG_NFS_FS
 	{nfs_read_super,	"nfs",		0},
 #endif
-#ifdef ISO9660_FS
+#ifdef CONFIG_ISO9660_FS
 	{isofs_read_super,	"iso9660",	1},
 #endif
 	{NULL,			NULL,		0}

--- a/fs/inode.c
+++ b/fs/inode.c
@@ -14,6 +14,7 @@

 static struct inode inode_table[NR_INODE];
 static struct inode * last_inode = inode_table;
+static struct wait_queue * inode_wait;

 void inode_init(void)
 {
@@ -196,6 +197,7 @@ void iput(struct inode * inode)
 		inode->i_count--;
 		return;
 	}
+	wake_up(&inode_wait);
 	if (inode->i_pipe) {
 		unsigned long page = (unsigned long) PIPE_BASE(*inode);
 		PIPE_BASE(*inode) = NULL;
@@ -232,10 +234,9 @@ struct inode * get_empty_inode(void)
 		}
 	}
 	if (!inode) {
-		for (i=0 ; i<NR_INODE ; i++)
-			printk("(%04x: %d (%o)) ",inode_table[i].i_dev,
-				inode_table[i].i_ino,inode_table[i].i_mode);
-		panic("No free inodes in mem");
+		printk("No free inodes - contact Linus\n");
+		sleep_on(&inode_wait);
+		goto repeat;
 	}
 	if (inode->i_lock) {
 		wait_on_inode(inode);

--- a/fs/isofs/.depend
+++ b/fs/isofs/.depend
+blkdev.o : blkdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
+chrdev.o : chrdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
+dir.o : dir.c /usr/include/linux/errno.h /usr/include/asm/segment.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/iso_fs.h \
+  /usr/include/linux/kernel.h /usr/include/linux/stat.h /usr/include/linux/string.h \
+  /usr/include/linux/mm.h 
+fifo.o : fifo.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h 
+file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/iso_fs.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h 
+namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/asm/segment.h \
+  /usr/include/linux/errno.h 
+rock.o : rock.c /usr/include/linux/config.h /usr/include/linux/autoconf.h /usr/include/linux/stat.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h /usr/include/linux/string.h \
+  rock.h 
+symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h /usr/include/linux/stat.h 
+util.o : util.c 
--- a/fs/isofs/Makefile
+++ b/fs/isofs/Makefile
@@ -14,104 +14,21 @@
 .s.o:
 	$(AS) -o $*.o $<

-OBJS=	namei.o inode.o file.o dir.o util.o rock.o symlink.o blkdev.o chrdev.o
+OBJS=	namei.o inode.o file.o dir.o util.o rock.o symlink.o \
+	fifo.o blkdev.o chrdev.o

 isofs.o: $(OBJS)
 	$(LD) -r -o isofs.o $(OBJS)

 clean:
-	rm -f core *.o *.a tmp_make
-	for i in *.c;do rm -f `basename $$i .c`.s;done
+	rm -f core *.o *.a *.s

 dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	for i in *.c;do $(CPP) -M $$i;done >> tmp_make
-	cp tmp_make Makefile
+	$(CPP) -M *.c > .depend

-### Dependencies:
-blkdev.o : blkdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
-chrdev.o : chrdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
-dir.o : dir.c /usr/include/linux/errno.h /usr/include/asm/segment.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/iso_fs.h \
-  /usr/include/linux/kernel.h /usr/include/linux/stat.h /usr/include/linux/string.h \
-  /usr/include/linux/mm.h 
-file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/iso_fs.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h 
-inode.o : inode.c /usr/include/linux/config.h /usr/include/linux/config.dist.h \
-  /usr/include/linux/stat.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
-  /usr/include/linux/string.h /usr/include/linux/locks.h /usr/include/asm/system.h \
-  /usr/include/asm/segment.h /usr/include/linux/errno.h 
-namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/asm/segment.h \
-  /usr/include/linux/errno.h 
-rock.o : rock.c /usr/include/linux/config.h /usr/include/linux/config.dist.h \
-  /usr/include/linux/stat.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h \
-  /usr/include/linux/string.h rock.h 
-symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
-  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/iso_fs.h /usr/include/linux/stat.h 
-util.o : util.c 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/isofs/dir.c
+++ b/fs/isofs/dir.c
@@ -23,7 +23,7 @@ static int isofs_readdir(struct inode *, struct file *, struct dirent *, int);

 static struct file_operations isofs_dir_operations = {
 	NULL,			/* lseek - default */
-	isofs_file_read,	/* read */
+	NULL,			/* read */
 	NULL,			/* write - bad */
 	isofs_readdir,		/* readdir */
 	NULL,			/* select - default */

--- a/fs/isofs/fifo.c
+++ b/fs/isofs/fifo.c
+/*
+ *  linux/fs/fifo.c
+ *
+ *  written by Paul H. Hargrove
+ */
+
+#include <linux/sched.h>
+#include <linux/iso_fs.h>
+
+extern struct file_operations def_fifo_fops;
+
+struct inode_operations isofs_fifo_inode_operations = {
+	&def_fifo_fops,		/* default file operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	NULL,			/* readlink */
+	NULL,			/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
--- a/fs/isofs/file.c
+++ b/fs/isofs/file.c
@@ -29,7 +29,7 @@
 #include <linux/fs.h>
 #include <linux/iso_fs.h>

-int isofs_file_read(struct inode *, struct file *, char *, int);
+static int isofs_file_read(struct inode *, struct file *, char *, int);

 /*
 * We have mostly NULL's here: the current defaults are ok for
@@ -38,7 +38,7 @@ int isofs_file_read(struct inode *, struct file *, char *, int);
 static struct file_operations isofs_file_operations = {
 	NULL,			/* lseek - default */
 	isofs_file_read,	/* read */
-	NULL,	/* write */
+	NULL,			/* write */
 	NULL,			/* readdir - bad */
 	NULL,			/* select - default */
 	NULL,			/* ioctl - default */
@@ -60,7 +60,7 @@ struct inode_operations isofs_file_inode_operations = {
 	NULL,			/* readlink */
 	NULL,			/* follow_link */
 	isofs_bmap,		/* bmap */
-	NULL	       	/* truncate */
+	NULL	       		/* truncate */
 };

 /* This is a heuristic to determine if a file is text of binary.  If it
@@ -108,13 +108,7 @@ static void isofs_determine_filetype(struct inode * inode)
 	}
 }

-/*
- * isofs_file_read() is also needed by the directory read-routine,
- * so it's not static. NOTE! reading directories directly is a bad idea,
- * but has to be supported for now for compatability reasons with older
- * versions.
- */
-int isofs_file_read(struct inode * inode, struct file * filp, char * buf, int count)
+static int isofs_file_read(struct inode * inode, struct file * filp, char * buf, int count)
 {
 	int read,left,chars;
 	int block, blocks, offset;

--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -316,6 +316,13 @@ void isofs_read_inode(struct inode * inode)
 	inode->i_gid = 0;
 	inode->i_size = isonum_733 (raw_inode->size);

+	/* There are defective discs out there - we do this to protect
+	   ourselves.  A cdrom will never contain more than 700Mb */
+	if(inode->i_size < 0 || inode->i_size > 700000000) {
+	  printk("Warning: defective cdrom.  Enabling \"cruft\" mount option.\n");
+	  inode->i_sb->u.isofs_sb.s_cruft = 'y';
+	};
+
 /* Some dipshit decided to store some other bit of information in the high
   byte of the file length.  Catch this and holler.  WARNING: this will make
   it impossible for a file to be > 16Mb on the CDROM!!!*/
@@ -412,6 +419,14 @@ void isofs_read_inode(struct inode * inode)
 		inode->i_op = &isofs_chrdev_inode_operations;
 	else if (S_ISBLK(inode->i_mode))
 		inode->i_op = &isofs_blkdev_inode_operations;
+	else if (S_ISFIFO(inode->i_mode)) {
+		inode->i_op = &isofs_fifo_inode_operations;
+		inode->i_pipe = 1;
+		PIPE_BASE(*inode) = NULL;
+		PIPE_HEAD(*inode) = PIPE_TAIL(*inode) = 0;
+		PIPE_READ_WAIT(*inode) = PIPE_WRITE_WAIT(*inode) = NULL;
+		PIPE_READERS(*inode) = PIPE_WRITERS(*inode) = 0;
+	}
 }

 /* There are times when we need to know the inode number of a parent of

--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -115,14 +115,18 @@ int find_rock_ridge_relocation(struct iso_directory_record * de,
 	CHECK_SP(goto out);
 	break;
      case SIG('C','L'):
+#ifdef DEBUG
 	printk("RR: CL\n");
+#endif
 	if (flag == 0) {
 	  retval = isonum_733(rr->u.CL.location);
 	  goto out;
 	};
 	break;
      case SIG('P','L'):
+#ifdef DEBUG
 	printk("RR: PL\n");
+#endif
 	if (flag != 0) {
 	  retval = isonum_733(rr->u.PL.location);
 	  goto out;
@@ -202,7 +206,9 @@ int get_rock_ridge_filename(struct iso_directory_record * de,
 	retnamlen += rr->len - 5;
 	break;
      case SIG('R','E'):
+#ifdef DEBUG
 	printk("RR: RE (%x)\n", inode->i_ino);
+#endif
 	if (buffer) kfree(buffer);
 	if (retname) kfree(retname);
 	return -1;
@@ -274,7 +280,7 @@ int parse_rock_ridge_inode(struct iso_directory_record * de,
 	{ int high, low;
 	  high = isonum_733(rr->u.PN.dev_high);
 	  low = isonum_733(rr->u.PN.dev_low);
-	  inode->i_rdev = ((high << 8) | (low && 0xff)) & 0xffff;
+	  inode->i_rdev = ((high << 8) | (low & 0xff)) & 0xffff;
 	};
 	break;
      case SIG('T','F'):
@@ -317,9 +323,12 @@ int parse_rock_ridge_inode(struct iso_directory_record * de,
 	printk("Attempt to read inode for relocated directory\n");
 	goto out;
      case SIG('C','L'):
+#ifdef DEBUG
 	printk("RR CL (%x)\n",inode->i_ino);
-	inode->u.isofs_i.i_first_extent = isonum_733(rr->u.CL.location);
-	reloc = iget(inode->i_sb, inode->u.isofs_i.i_first_extent << ISOFS_BLOCK_BITS);
+#endif
+	inode->u.isofs_i.i_first_extent = isonum_733(rr->u.CL.location) <<
+		(ISOFS_BLOCK_BITS - ISOFS_BUFFER_BITS);
+	reloc = iget(inode->i_sb, inode->u.isofs_i.i_first_extent << ISOFS_BUFFER_BITS);
 	inode->i_mode = reloc->i_mode;
 	inode->i_nlink = reloc->i_nlink;
 	inode->i_uid = reloc->i_uid;

--- a/fs/minix/.depend
+++ b/fs/minix/.depend
+bitmap.o : bitmap.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/stat.h \
+  /usr/include/linux/string.h 
+blkdev.o : blkdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
+chrdev.o : chrdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
+dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/minix_fs.h \
+  /usr/include/linux/stat.h 
+fifo.o : fifo.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h 
+file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/minix_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h 
+inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
+  /usr/include/asm/segment.h 
+namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
+  /usr/include/asm/segment.h 
+symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/stat.h 
+truncate.o : truncate.c /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/minix_fs.h /usr/include/linux/tty.h /usr/include/linux/termios.h \
+  /usr/include/asm/system.h /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
--- a/fs/minix/Makefile
+++ b/fs/minix/Makefile
@@ -21,114 +21,14 @@ minix.o: $(OBJS)
 	$(LD) -r -o minix.o $(OBJS)

 clean:
-	rm -f core *.o *.a tmp_make
-	for i in *.c;do rm -f `basename $$i .c`.s;done
+	rm -f core *.o *.a *.s

 dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	$(CPP) -M *.c >> tmp_make
-	cp tmp_make Makefile
+	$(CPP) -M *.c > .depend

-### Dependencies:
-bitmap.o : bitmap.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/stat.h \
-  /usr/include/linux/string.h 
-blkdev.o : blkdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
-chrdev.o : chrdev.c /usr/include/linux/errno.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h \
-  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/asm/system.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
-dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/minix_fs.h \
-  /usr/include/linux/stat.h 
-fifo.o : fifo.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h 
-file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/minix_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h 
-inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
-  /usr/include/asm/segment.h 
-namei.o : namei.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/fcntl.h /usr/include/linux/errno.h \
-  /usr/include/asm/segment.h 
-symlink.o : symlink.c /usr/include/asm/segment.h /usr/include/linux/errno.h \
-  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/minix_fs.h /usr/include/linux/stat.h 
-truncate.o : truncate.c /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/minix_fs.h /usr/include/linux/tty.h /usr/include/linux/termios.h \
-  /usr/include/asm/system.h /usr/include/linux/stat.h /usr/include/linux/fcntl.h 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -65,37 +65,41 @@ static int minix_file_read(struct inode * inode, struct file * filp, char * buf,
 {
 	int read,left,chars;
 	int block, blocks, offset;
-	int bhrequest;
-	int ra_blocks, max_block, nextblock;
+	int bhrequest, uptodate;
 	struct buffer_head ** bhb, ** bhe;
 	struct buffer_head * bhreq[NBUF];
 	struct buffer_head * buflist[NBUF];
+	unsigned int size;

 	if (!inode) {
 		printk("minix_file_read: inode = NULL\n");
 		return -EINVAL;
 	}
-	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) {
+	if (!S_ISREG(inode->i_mode)) {
 		printk("minix_file_read: mode = %07o\n",inode->i_mode);
 		return -EINVAL;
 	}
-	if (filp->f_pos > inode->i_size)
+	offset = filp->f_pos;
+	size = inode->i_size;
+	if (offset > size)
 		left = 0;
 	else
-		left = inode->i_size - filp->f_pos;
+		left = size - offset;
 	if (left > count)
 		left = count;
 	if (left <= 0)
 		return 0;
 	read = 0;
-	block = filp->f_pos >> BLOCK_SIZE_BITS;
-	offset = filp->f_pos & (BLOCK_SIZE-1);
-	blocks = (left + offset + BLOCK_SIZE - 1) / BLOCK_SIZE;
+	block = offset >> BLOCK_SIZE_BITS;
+	offset &= BLOCK_SIZE-1;
+	size = (size + (BLOCK_SIZE-1)) >> BLOCK_SIZE_BITS;
+	blocks = (left + offset + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS;
 	bhb = bhe = buflist;
-
-	ra_blocks = read_ahead[MAJOR(inode->i_dev)] / (BLOCK_SIZE >> 9);
-	max_block = (inode->i_size + BLOCK_SIZE - 1)/BLOCK_SIZE;
-	nextblock = -1;
+	if (filp->f_reada) {
+		blocks += read_ahead[MAJOR(inode->i_dev)] / (BLOCK_SIZE >> 9);
+		if (block + blocks > size)
+			blocks = size - block;
+	}

 	/* We do this in a two stage process.  We first try and request
 	   as many blocks as we can, then we wait for the first one to
@@ -108,104 +112,69 @@ static int minix_file_read(struct inode * inode, struct file * filp, char * buf,
 	   buffers and caches. */

 	do {
-	        bhrequest = 0;
+		bhrequest = 0;
+	        uptodate = 1;
 		while (blocks) {
-		        int uptodate;
 			--blocks;
 			*bhb = minix_getblk(inode, block++, 0);
-			uptodate = 1;
 			if (*bhb && !(*bhb)->b_uptodate) {
 			        uptodate = 0;
 			        bhreq[bhrequest++] = *bhb;
-				nextblock = (*bhb)->b_blocknr + 1;
-			      };
+			}

 			if (++bhb == &buflist[NBUF])
 				bhb = buflist;

 			/* If the block we have on hand is uptodate, go ahead
 			   and complete processing. */
-			if(bhrequest == 0 && uptodate) break;
-
+			if (uptodate)
+				break;
 			if (bhb == bhe)
 				break;
-		      }
-
-		if(blocks == 0 && bhrequest && filp->f_reada && bhb != bhe) { 
-		  /* If we are going to read something anyways, add in the
-		     read-ahead blocks */
-		  while(ra_blocks){
-		    if (block >= max_block) break;
-		    if(bhrequest == NBUF) break;  /* Block full */
-		    --ra_blocks;
-		    *bhb = minix_getblk(inode, block++, 0);
+		}

-		    if (*bhb && !(*bhb)->b_uptodate) {
-		      if((*bhb)->b_blocknr != nextblock) {
-			brelse(*bhb);
-			break;
-		      };
-		      nextblock = (*bhb)->b_blocknr + 1;
-		      bhreq[bhrequest++] = *bhb;
-		    };
-		    
-		    if (++bhb == &buflist[NBUF])
-		      bhb = buflist;
-		    
-		    if (bhb == bhe)
-		      break;
-		  };
-		};
 		/* Now request them all */
 		if (bhrequest)
-		  ll_rw_block(READ, bhrequest, bhreq);
-
-		do{ /* Finish off all I/O that has actually completed */
-		  if (*bhe) {/* test for valid buffer */
-		    wait_on_buffer(*bhe);
-		    if (!(*bhe)->b_uptodate) {
-		      do {
-			brelse(*bhe);
+			ll_rw_block(READ, bhrequest, bhreq);
+
+		do { /* Finish off all I/O that has actually completed */
+			if (*bhe) {
+				wait_on_buffer(*bhe);
+				if (!(*bhe)->b_uptodate) {	/* read error? */
+					left = 0;
+					break;
+				}
+			}
+			if (left < BLOCK_SIZE - offset)
+				chars = left;
+			else
+				chars = BLOCK_SIZE - offset;
+			filp->f_pos += chars;
+			left -= chars;
+			read += chars;
+			if (*bhe) {
+				memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
+				brelse(*bhe);
+				buf += chars;
+			} else {
+				while (chars-->0)
+					put_fs_byte(0,buf++);
+			}
+			offset = 0;
 			if (++bhe == &buflist[NBUF])
-			  bhe = buflist;
-		      } while (bhe != bhb);
-		      break;
-		    }
-		  }
-		  
-		  if (left < BLOCK_SIZE - offset)
-		    chars = left;
-		  else
-		    chars = BLOCK_SIZE - offset;
-		  filp->f_pos += chars;
-		  left -= chars;
-		  read += chars;
-		  if (*bhe) {
-		    memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
-		    brelse(*bhe);
-		    buf += chars;
-		  } else {
-		    while (chars-->0)
-		      put_fs_byte(0,buf++);
-		  }
-		  offset = 0;
-		  if (++bhe == &buflist[NBUF])
-		    bhe = buflist;
-		} while( bhe != bhb && (*bhe == 0 || !(*bhe)->b_lock) && 
-			(left > 0));
+				bhe = buflist;
+		} while (left > 0 && bhe != bhb && (!*bhe || !(*bhe)->b_lock));
 	} while (left > 0);

 /* Release the read-ahead blocks */
 	while (bhe != bhb) {
-	  if (*bhe) brelse(*bhe);
-	  if (++bhe == &buflist[NBUF])
-	    bhe = buflist;
+		brelse(*bhe);
+		if (++bhe == &buflist[NBUF])
+			bhe = buflist;
 	};
-
-	filp->f_reada = 1;
-
 	if (!read)
 		return -EIO;
+	filp->f_reada = 1;
 	if (!IS_RDONLY(inode)) {
 		inode->i_atime = CURRENT_TIME;
 		inode->i_dirt = 1;

--- a/fs/msdos/.depend
+++ b/fs/msdos/.depend
+dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/msdos_fs.h \
+  /usr/include/linux/errno.h /usr/include/linux/stat.h 
+fat.o : fat.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/kernel.h /usr/include/linux/errno.h \
+  /usr/include/linux/stat.h 
+file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/msdos_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
+  /usr/include/linux/stat.h 
+inode.o : inode.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/kernel.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/mm.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/errno.h \
+  /usr/include/linux/string.h /usr/include/linux/ctype.h /usr/include/linux/stat.h \
+  /usr/include/linux/locks.h /usr/include/asm/segment.h 
+misc.o : misc.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/errno.h \
+  /usr/include/linux/string.h /usr/include/linux/stat.h 
+namei.o : namei.c /usr/include/asm/segment.h /usr/include/linux/sched.h /usr/include/linux/head.h \
+  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
+  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/msdos_fs.h \
+  /usr/include/linux/errno.h /usr/include/linux/string.h /usr/include/linux/stat.h 
--- a/fs/msdos/Makefile
+++ b/fs/msdos/Makefile
@@ -20,71 +20,14 @@ msdos.o: $(OBJS)
 	$(LD) -r -o msdos.o $(OBJS)

 clean:
-	rm -f core *.o *.a tmp_make
-	for i in *.c;do rm -f `basename $$i .c`.s;done
+	rm -f core *.o *.a *.s

 dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	$(CPP) -M *.c >> tmp_make
-	cp tmp_make Makefile
+	$(CPP) -M *.c > .depend

-### Dependencies:
-dir.o : dir.c /usr/include/asm/segment.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/msdos_fs.h \
-  /usr/include/linux/errno.h /usr/include/linux/stat.h 
-fat.o : fat.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/kernel.h /usr/include/linux/errno.h \
-  /usr/include/linux/stat.h 
-file.o : file.c /usr/include/asm/segment.h /usr/include/asm/system.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/msdos_fs.h /usr/include/linux/errno.h /usr/include/linux/fcntl.h \
-  /usr/include/linux/stat.h 
-inode.o : inode.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/kernel.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/mm.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/errno.h \
-  /usr/include/linux/string.h /usr/include/linux/ctype.h /usr/include/linux/stat.h \
-  /usr/include/linux/locks.h /usr/include/asm/segment.h 
-misc.o : misc.c /usr/include/linux/msdos_fs.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/errno.h \
-  /usr/include/linux/string.h /usr/include/linux/stat.h 
-namei.o : namei.c /usr/include/asm/segment.h /usr/include/linux/sched.h /usr/include/linux/head.h \
-  /usr/include/linux/fs.h /usr/include/linux/limits.h /usr/include/linux/wait.h \
-  /usr/include/linux/types.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/linux/msdos_fs.h \
-  /usr/include/linux/errno.h /usr/include/linux/string.h /usr/include/linux/stat.h 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -226,12 +226,17 @@ int open_namei(const char * pathname, int flag, int mode,
 	if (error)
 		return error;
 	if (!namelen) {			/* special case: '/usr/' etc */
-		if (!(flag & 2)) {
-			*res_inode=dir;
-			return 0;
+		if (flag & 2) {
+			iput(dir);
+			return -EISDIR;
 		}
-		iput(dir);
-		return -EISDIR;
+		/* thanks to Paul Pluzhnikov for noticing this was missing.. */
+		if (!permission(dir,ACC_MODE(flag))) {
+			iput(dir);
+			return -EACCES;
+		}
+		*res_inode=dir;
+		return 0;
 	}
 	dir->i_count++;		/* lookup eats the dir */
 	error = lookup(dir,basename,namelen,&inode);
@@ -264,7 +269,7 @@ int open_namei(const char * pathname, int flag, int mode,
 		return error;
 	if (S_ISDIR(inode->i_mode) && (flag & 2)) {
 		iput(inode);
-		return -EPERM;
+		return -EISDIR;
 	}
 	if (!permission(inode,ACC_MODE(flag))) {
 		iput(inode);

--- a/fs/nfs/.depend
+++ b/fs/nfs/.depend
--- a/fs/nfs/Makefile
+++ b/fs/nfs/Makefile
+#
+# Makefile for the linux nfs-filesystem routines.
+#
+# Note! Dependencies are done automagically by 'make dep', which also
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (ie not a .c file).
+#
+# Note 2! The CFLAGS definitions are now in the main makefile...
+
+.c.s:
+	$(CC) $(CFLAGS) -S $<
+.c.o:
+	$(CC) $(CFLAGS) -c $<
+.s.o:
+	$(AS) -o $*.o $<
+
+OBJS=	proc.o sock.o inode.o file.o dir.o \
+	symlink.o blkdev.o chrdev.o fifo.o
+
+nfs.o: $(OBJS)
+	$(LD) -r -o nfs.o $(OBJS)
+
+clean:
+	rm -f core *.o *.a *.s
+
+dep:
+	$(CPP) -M *.c > .depend
+
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/nfs/blkdev.c
+++ b/fs/nfs/blkdev.c
+/*
+ *  linux/fs/nfs/blkdev.c
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/nfs_fs.h>
+#include <linux/tty.h>
+#include <linux/stat.h>
+#include <linux/fcntl.h>
+
+/*
+ * Called every time a nfs block special file is opened
+ */
+static int blkdev_open(struct inode * inode, struct file * filp)
+{
+	int i;
+
+	i = MAJOR(inode->i_rdev);
+	if (i < MAX_BLKDEV) {
+		filp->f_op = blkdev_fops[i];
+		if (filp->f_op && filp->f_op->open)
+			return filp->f_op->open(inode,filp);
+	}
+	return 0;
+}	
+
+/*
+ * Dummy default file-operations: the only thing this does
+ * is contain the open that then fills in the correct operations
+ * depending on the special file...
+ */
+static struct file_operations def_blk_fops = {
+	NULL,		/* lseek */
+	NULL,		/* read */
+	NULL,		/* write */
+	NULL,		/* readdir */
+	NULL,		/* select */
+	NULL,		/* ioctl */
+	NULL,		/* mmap */
+	blkdev_open,	/* open */
+	NULL,		/* release */
+};
+
+struct inode_operations nfs_blkdev_inode_operations = {
+	&def_blk_fops,		/* default file operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	NULL,			/* readlink */
+	NULL,			/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
--- a/fs/nfs/chrdev.c
+++ b/fs/nfs/chrdev.c
+/*
+ *  linux/fs/nfs/chrdev.c
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/nfs_fs.h>
+#include <linux/tty.h>
+#include <linux/stat.h>
+#include <linux/fcntl.h>
+
+/*
+ * Called every time a nfs character special file is opened
+ */
+static int chrdev_open(struct inode * inode, struct file * filp)
+{
+	int i;
+
+	i = MAJOR(inode->i_rdev);
+	if (i < MAX_CHRDEV) {
+		filp->f_op = chrdev_fops[i];
+		if (filp->f_op && filp->f_op->open)
+			return filp->f_op->open(inode,filp);
+	}
+	return 0;
+}
+
+/*
+ * Dummy default file-operations: the only thing this does
+ * is contain the open that then fills in the correct operations
+ * depending on the special file...
+ */
+static struct file_operations def_chr_fops = {
+	NULL,		/* lseek */
+	NULL,		/* read */
+	NULL,		/* write */
+	NULL,		/* readdir */
+	NULL,		/* select */
+	NULL,		/* ioctl */
+	NULL,		/* mmap */
+	chrdev_open,	/* open */
+	NULL,		/* release */
+};
+
+struct inode_operations nfs_chrdev_inode_operations = {
+	&def_chr_fops,		/* default file operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	NULL,			/* readlink */
+	NULL,			/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
+
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/fifo.c
+++ b/fs/nfs/fifo.c
+/*
+ *  linux/fs/fifo.c
+ *
+ *  written by Paul H. Hargrove
+ */
+
+#include <linux/sched.h>
+#include <linux/nfs_fs.h>
+
+extern struct file_operations def_fifo_fops;
+
+struct inode_operations nfs_fifo_inode_operations = {
+	&def_fifo_fops,		/* default file operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	NULL,			/* readlink */
+	NULL,			/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
+/*
+ *  linux/fs/nfs/file.c
+ *
+ *  Copyright (C) 1992  Rick Sladkey
+ *
+ *  nfs regular file handling functions
+ */
+
+#include <asm/segment.h>
+#include <asm/system.h>
+
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/fcntl.h>
+#include <linux/stat.h>
+#include <linux/mm.h>
+#include <linux/nfs_fs.h>
+
+static int nfs_file_read(struct inode *, struct file *, char *, int);
+static int nfs_file_write(struct inode *, struct file *, char *, int);
+
+static struct file_operations nfs_file_operations = {
+	NULL,			/* lseek - default */
+	nfs_file_read,		/* read */
+	nfs_file_write,		/* write */
+	NULL,			/* readdir - bad */
+	NULL,			/* select - default */
+	NULL,			/* ioctl - default */
+	NULL,			/* mmap */
+	NULL,			/* no special open is needed */
+	NULL			/* release */
+};
+
+struct inode_operations nfs_file_inode_operations = {
+	&nfs_file_operations,	/* default file operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	NULL,			/* readlink */
+	NULL,			/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
+
+static int nfs_file_read(struct inode *inode, struct file *file, char *buf,
+			 int count)
+{
+	int result;
+	int hunk;
+	int i;
+	int n;
+	struct nfs_fattr fattr;
+	char *data;
+
+	if (!inode) {
+		printk("nfs_file_read: inode = NULL\n");
+		return -EINVAL;
+	}
+	if (!S_ISREG(inode->i_mode)) {
+		printk("nfs_file_read: read from non-file, mode %07o\n",
+			inode->i_mode);
+		return -EINVAL;
+	}
+	if (file->f_pos + count > inode->i_size)
+		count = inode->i_size - file->f_pos;
+	if (count <= 0)
+		return 0;
+	n = NFS_SERVER(inode)->rsize;
+	data = (char *) kmalloc(n, GFP_KERNEL);
+	for (i = 0; i < count; i += n) {
+		hunk = count - i;
+		if (hunk > n)
+			hunk = n;
+		result = nfs_proc_read(NFS_SERVER(inode), NFS_FH(inode), 
+			file->f_pos, hunk, data, &fattr);
+		if (result < 0) {
+			kfree_s(data, n);
+			return result;
+		}
+		memcpy_tofs(buf, data, result);
+		file->f_pos += result;
+		buf += result;
+		if (result < n) {
+			i += result;
+			break;
+		}
+	}
+	kfree_s(data, n);
+	nfs_refresh_inode(inode, &fattr);
+	return i;
+}
+
+static int nfs_file_write(struct inode *inode, struct file *file, char *buf,
+			  int count)
+{
+	int result;
+	int hunk;
+	int i;
+	int n;
+	struct nfs_fattr fattr;
+	char *data;
+
+	if (!inode) {
+		printk("nfs_file_write: inode = NULL\n");
+		return -EINVAL;
+	}
+	if (!S_ISREG(inode->i_mode)) {
+		printk("nfs_file_write: write to non-file, mode %07o\n",
+			inode->i_mode);
+		return -EINVAL;
+	}
+	if (count <= 0)
+		return 0;
+	if (file->f_flags & O_APPEND)
+		file->f_pos = inode->i_size;
+	n = NFS_SERVER(inode)->wsize;
+	data = (char *) kmalloc(n, GFP_KERNEL);
+	for (i = 0; i < count; i += n) {
+		hunk = count - i;
+		if (hunk >= n)
+			hunk = n;
+		memcpy_fromfs(data, buf, hunk);
+		result = nfs_proc_write(NFS_SERVER(inode), NFS_FH(inode), 
+			file->f_pos, hunk, data, &fattr);
+		if (result < 0) {
+			kfree_s(data, n);
+			return result;
+		}
+		file->f_pos += hunk;
+		buf += hunk;
+		if (hunk < n) {
+			i += hunk;
+			break;
+		}
+	}
+	kfree_s(data, n);
+	nfs_refresh_inode(inode, &fattr);
+	return i;
+}
+
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
+/*
+ *  linux/fs/nfs/inode.c
+ *
+ *  Copyright (C) 1992  Rick Sladkey
+ *
+ *  nfs inode and superblock handling functions
+ */
+
+#include <asm/system.h>
+#include <asm/segment.h>
+
+#include <linux/sched.h>
+#include <linux/nfs_fs.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/stat.h>
+#include <linux/errno.h>
+#include <linux/locks.h>
+
+extern int close_fp(struct file *filp);
+
+static int nfs_notify_change(struct inode *);
+static void nfs_put_super(struct super_block *);
+static void nfs_statfs(struct super_block *, struct statfs *);
+
+static struct super_operations nfs_sops = { 
+	NULL,			/* read inode */
+	nfs_notify_change,	/* notify change */
+	NULL,			/* write inode */
+	NULL,			/* put inode */
+	nfs_put_super,		/* put superblock */
+	NULL,			/* write superblock */
+	nfs_statfs		/* stat filesystem */
+};
+
+void nfs_put_super(struct super_block *sb)
+{
+	close_fp(sb->u.nfs_sb.s_server.file);
+	lock_super(sb);
+	sb->s_dev = 0;
+	unlock_super(sb);
+}
+
+/*
+ * The way this works is that the mount process passes a structure
+ * in the data argument which contains an open socket to the NFS
+ * server and the root file handle obtained from the server's mount
+ * daemon.  We stash theses away in the private superblock fields.
+ * Later we can add other mount parameters like caching values.
+ */
+
+struct super_block *nfs_read_super(struct super_block *sb, void *raw_data)
+{
+	struct nfs_mount_data *data = (struct nfs_mount_data *) raw_data;
+	struct nfs_server *server;
+	unsigned int fd;
+	struct file *filp;
+	dev_t dev = sb->s_dev;
+
+	if (!data) {
+		printk("nfs_read_super: missing data argument\n");
+		sb->s_dev = 0;
+		return NULL;
+	}
+	fd = data->fd;
+	if (data->version != NFS_MOUNT_VERSION) {
+		printk("nfs warning: mount version %s than kernel\n",
+			data->version < NFS_MOUNT_VERSION ? "older" : "newer");
+	}
+	if (fd >= NR_OPEN || !(filp = current->filp[fd])) {
+		printk("nfs_read_super: invalid file descriptor\n");
+		sb->s_dev = 0;
+		return NULL;
+	}
+	if (!S_ISSOCK(filp->f_inode->i_mode)) {
+		printk("nfs_read_super: not a socket\n");
+		sb->s_dev = 0;
+		return NULL;
+	}
+	filp->f_count++;
+	lock_super(sb);
+	sb->s_blocksize = 1024; /* XXX */
+	sb->s_magic = NFS_SUPER_MAGIC;
+	sb->s_dev = dev;
+	sb->s_op = &nfs_sops;
+	server = &sb->u.nfs_sb.s_server;
+	server->file = filp;
+	server->lock = 0;
+	server->wait = NULL;
+	server->flags = data->flags;
+	server->rsize = data->rsize;
+	if (server->rsize <= 0)
+		server->rsize = NFS_DEF_FILE_IO_BUFFER_SIZE;
+	else if (server->rsize >= NFS_MAX_FILE_IO_BUFFER_SIZE)
+		server->rsize = NFS_MAX_FILE_IO_BUFFER_SIZE;
+	server->wsize = data->wsize;
+	if (server->wsize <= 0)
+		server->wsize = NFS_DEF_FILE_IO_BUFFER_SIZE;
+	else if (server->wsize >= NFS_MAX_FILE_IO_BUFFER_SIZE)
+		server->wsize = NFS_MAX_FILE_IO_BUFFER_SIZE;
+	server->timeo = data->timeo*HZ/10;
+	server->retrans = data->retrans;
+	server->acregmin = data->acregmin*HZ;
+	server->acregmax = data->acregmax*HZ;
+	server->acdirmin = data->acdirmin*HZ;
+	server->acdirmax = data->acdirmax*HZ;
+	strcpy(server->hostname, data->hostname);
+	sb->u.nfs_sb.s_root = data->root;
+	unlock_super(sb);
+	if (!(sb->s_mounted = nfs_fhget(sb, &data->root, NULL))) {
+		sb->s_dev = 0;
+		printk("nfs_read_super: get root inode failed\n");
+		return NULL;
+	}
+	return sb;
+}
+
+void nfs_statfs(struct super_block *sb, struct statfs *buf)
+{
+	int error;
+	struct nfs_fsinfo res;
+
+	put_fs_long(NFS_SUPER_MAGIC, &buf->f_type);
+	error = nfs_proc_statfs(&sb->u.nfs_sb.s_server, &sb->u.nfs_sb.s_root,
+		&res);
+	if (error) {
+		if (error != -EINTR)
+			printk("nfs_statfs: statfs error = %d\n", -error);
+		res.bsize = res.blocks = res.bfree = res.bavail = 0;
+	}
+	put_fs_long(res.bsize, &buf->f_bsize);
+	put_fs_long(res.blocks, &buf->f_blocks);
+	put_fs_long(res.bfree, &buf->f_bfree);
+	put_fs_long(res.bavail, &buf->f_bavail);
+#if 0
+	put_fs_long(-1, &buf->f_files);
+	put_fs_long(-1, &buf->f_ffree);
+#else
+	put_fs_long(0, &buf->f_files);
+	put_fs_long(0, &buf->f_ffree);
+#endif
+}
+
+/*
+ * This is our own version of iget that looks up inodes by file handle
+ * instead of inode number.  We use this technique instead of using
+ * the vfs read_inode function because there is no way to pass the
+ * file handle or current attributes into the read_inode function.
+ * We just have to be careful not to subvert iget's special handling
+ * of mount points.
+ */
+
+struct inode *nfs_fhget(struct super_block *sb, struct nfs_fh *fhandle,
+			struct nfs_fattr *fattr)
+{
+	struct nfs_fattr newfattr;
+	int error;
+	struct inode *inode;
+
+	if (!sb) {
+		printk("nfs_fhget: super block is NULL\n");
+		return NULL;
+	}
+	if (!fattr) {
+		error = nfs_proc_getattr(&sb->u.nfs_sb.s_server, fhandle,
+			&newfattr);
+		if (error) {
+			printk("nfs_fhget: getattr error = %d\n", -error);
+			return NULL;
+		}
+		fattr = &newfattr;
+	}
+	if (!(inode = iget(sb, fattr->fileid))) {
+		printk("nfs_fhget: iget failed\n");
+		return NULL;
+	}
+	if (inode->i_dev == sb->s_dev) {
+		if (inode->i_ino != fattr->fileid) {
+			printk("nfs_fhget: unexpected inode from iget\n");
+			return inode;
+		}
+		*NFS_FH(inode) = *fhandle;
+		nfs_refresh_inode(inode, fattr);
+	}
+	return inode;
+}
+
+int nfs_notify_change(struct inode *inode)
+{
+	struct nfs_sattr sattr;
+	struct nfs_fattr fattr;
+	int error;
+
+	sattr.mode = inode->i_mode;
+	sattr.uid = inode->i_uid;
+	sattr.gid = inode->i_gid;
+	sattr.size = S_ISREG(inode->i_mode) ? inode->i_size : -1;
+	sattr.mtime.seconds = inode->i_mtime;
+	sattr.mtime.useconds = 0;
+	sattr.atime.seconds = inode->i_atime;
+	sattr.atime.useconds = 0;
+	error = nfs_proc_setattr(NFS_SERVER(inode), NFS_FH(inode),
+		&sattr, &fattr);
+	if (!error)
+		nfs_refresh_inode(inode, &fattr);
+	inode->i_dirt = 0;
+	return error;
+}
+
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
--- a/fs/nfs/sock.c
+++ b/fs/nfs/sock.c
+/*
+ *  linux/fs/nfs/sock.c
+ *
+ *  Copyright (C) 1992  Rick Sladkey
+ *
+ *  low-level nfs remote procedure call interface
+ */
+
+#include <linux/sched.h>
+#include <linux/nfs_fs.h>
+#include <linux/errno.h>
+#include <linux/socket.h>
+#include <linux/fcntl.h>
+
+#include <netinet/in.h>
+
+#include "../../net/kern_sock.h"
+
+extern struct socket *socki_lookup(struct inode *inode);
+
+/*
+ * We violate some modularity principles here by poking around
+ * in some socket internals.  Besides having to call socket
+ * functions from kernel-space instead of user space, the socket
+ * interface does not lend itself well to being cleanly called
+ * without a file descriptor.  Since the nfs calls can run on
+ * behalf of any process, the superblock maintains a file pointer
+ * to the server socket.
+ */
+
+static int do_nfs_rpc_call(struct nfs_server *server, int *start, int *end)
+{
+	struct file *file;
+	struct inode *inode;
+	struct socket *sock;
+	unsigned short fs;
+	int result;
+	int xid;
+	int len;
+	select_table wait_table;
+	struct select_table_entry entry;
+	int (*select) (struct inode *, struct file *, int, select_table *);
+	int init_timeout, max_timeout;
+	int timeout;
+	int retrans;
+	int major_timeout_seen;
+	char *server_name;
+	int n;
+
+	xid = start[0];
+	len = ((char *) end) - ((char *) start);
+	file = server->file;
+	inode = file->f_inode;
+	select = file->f_op->select;
+	sock = socki_lookup(inode);
+	init_timeout = server->timeo;
+	max_timeout = NFS_MAX_RPC_TIMEOUT*HZ/10;
+	retrans = server->retrans;
+	major_timeout_seen = 0;
+	server_name = server->hostname;
+	if (!sock) {
+		printk("nfs_rpc_call: socki_lookup failed\n");
+		return -EBADF;
+	}
+	__asm__("mov %%fs,%0":"=r" (fs));
+	__asm__("mov %0,%%fs"::"r" ((unsigned short) 0x10));
+	for (n = 0, timeout = init_timeout; ; n++, timeout <<= 1) {
+		result = sock->ops->send(sock, (void *) start, len, 0, 0);
+		if (result < 0) {
+			printk("nfs_rpc_call: send error = %d\n", result);
+			break;
+		}
+	re_select:
+		wait_table.nr = 0;
+		wait_table.entry = &entry;
+		current->state = TASK_INTERRUPTIBLE;
+		if (!select(inode, file, SEL_IN, &wait_table)
+		    && !select(inode, file, SEL_IN, NULL)) {
+			if (timeout > max_timeout)
+				timeout = max_timeout;
+			current->timeout = jiffies + timeout;
+			schedule();
+			remove_wait_queue(entry.wait_address, &entry.wait);
+			current->state = TASK_RUNNING;
+			if (current->signal & ~current->blocked) {
+#if 0
+				/* doesn't work yet */
+				if (!(server->flags & NFS_MOUNT_INTR))
+					goto re_select;
+#endif
+				current->timeout = 0;
+				result = -EINTR;
+				break;
+			}
+			if (!current->timeout) {
+				if (n < retrans)
+					continue;
+				if (server->flags & NFS_MOUNT_SOFT) {
+					printk("NFS server %s not responding, "
+						"timed out", server_name);
+					result = -EIO;
+					break;
+				}
+				n = 0;
+				timeout = init_timeout;
+				init_timeout <<= 1;
+				if (!major_timeout_seen) {
+					printk("NFS server %s not responding, "
+						"still trying\n", server_name);
+				}
+				major_timeout_seen = 1;
+				continue;
+			}
+			else
+				current->timeout = 0;
+		}
+		else if (wait_table.nr)
+			remove_wait_queue(entry.wait_address, &entry.wait);
+		current->state = TASK_RUNNING;
+		result = sock->ops->recv(sock, (void *) start, 4096, 1, 0);
+		if (result < 0) {
+			if (result == -EAGAIN) {
+				printk("nfs_rpc_call: bad select ready\n");
+				goto re_select;
+			}
+			if (result != -ERESTARTSYS) {
+				printk("nfs_rpc_call: recv error = %d\n",
+					-result);
+			}
+			break;
+		}
+		if (*start == xid) {
+			if (major_timeout_seen)
+				printk("NFS server %s OK\n", server_name);
+			break;
+		}
+#if 0
+		printk("nfs_rpc_call: XID mismatch\n");
+#endif
+	}
+	__asm__("mov %0,%%fs"::"r" (fs));
+	return result;
+}
+
+/*
+ * For now we lock out other simulaneous nfs calls for the same filesytem
+ * because we are single-threaded and don't want to get mismatched
+ * RPC replies.
+ */
+
+int nfs_rpc_call(struct nfs_server *server, int *start, int *end)
+{
+	int result;
+
+	while (server->lock)
+		sleep_on(&server->wait);
+	server->lock = 1;
+	result = do_nfs_rpc_call(server, start, end);
+	server->lock = 0;
+	wake_up(&server->wait);
+	return result;
+}
+
--- a/fs/nfs/symlink.c
+++ b/fs/nfs/symlink.c
+/*
+ *  linux/fs/nfs/symlink.c
+ *
+ *  Copyright (C) 1992  Rick Sladkey
+ *
+ *  nfs symlink handling code
+ */
+
+#include <asm/segment.h>
+
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/nfs_fs.h>
+#include <linux/stat.h>
+#include <linux/mm.h>
+
+static int nfs_readlink(struct inode *, char *, int);
+static int nfs_follow_link(struct inode *, struct inode *, int, int,
+			   struct inode **);
+
+/*
+ * symlinks can't do much...
+ */
+struct inode_operations nfs_symlink_inode_operations = {
+	NULL,			/* no file-operations */
+	NULL,			/* create */
+	NULL,			/* lookup */
+	NULL,			/* link */
+	NULL,			/* unlink */
+	NULL,			/* symlink */
+	NULL,			/* mkdir */
+	NULL,			/* rmdir */
+	NULL,			/* mknod */
+	NULL,			/* rename */
+	nfs_readlink,		/* readlink */
+	nfs_follow_link,	/* follow_link */
+	NULL,			/* bmap */
+	NULL			/* truncate */
+};
+
+static int nfs_follow_link(struct inode *dir, struct inode *inode,
+			   int flag, int mode, struct inode **res_inode)
+{
+	int error;
+	unsigned short fs;
+	char *res;
+
+	*res_inode = NULL;
+	if (!dir) {
+		dir = current->root;
+		dir->i_count++;
+	}
+	if (!inode) {
+		iput(dir);
+		return -ENOENT;
+	}
+	if (!S_ISLNK(inode->i_mode)) {
+		iput(dir);
+		*res_inode = inode;
+		return 0;
+	}
+	if (current->link_count > 5) {
+		iput(inode);
+		iput(dir);
+		return -ELOOP;
+	}
+	res = (char *) kmalloc(NFS_MAXPATHLEN + 1, GFP_KERNEL);
+	error = nfs_proc_readlink(NFS_SERVER(inode), NFS_FH(inode), res);
+	if (error) {
+		iput(inode);
+		iput(dir);
+		kfree_s(res, NFS_MAXPATHLEN + 1);
+		return error;
+	}
+	iput(inode);
+	__asm__("mov %%fs,%0":"=r" (fs));
+	__asm__("mov %0,%%fs"::"r" ((unsigned short) 0x10));
+	current->link_count++;
+	error = open_namei(res, flag, mode, res_inode, dir);
+	current->link_count--;
+	kfree_s(res, NFS_MAXPATHLEN + 1);
+	__asm__("mov %0,%%fs"::"r" (fs));
+	return error;
+}
+
+static int nfs_readlink(struct inode *inode, char *buffer, int buflen)
+{
+	int i;
+	char c;
+	int error;
+	char *res;
+
+	if (!S_ISLNK(inode->i_mode)) {
+		iput(inode);
+		return -EINVAL;
+	}
+	if (buflen > NFS_MAXPATHLEN)
+		buflen = NFS_MAXPATHLEN;
+	res = (char *) kmalloc(buflen + 1, GFP_KERNEL);
+	error = nfs_proc_readlink(NFS_SERVER(inode), NFS_FH(inode), res);
+	iput(inode);
+	if (error) {
+		kfree_s(res, buflen + 1);
+		return error;
+	}
+	for (i = 0; i < buflen && (c = res[i]); i++)
+		put_fs_byte(c,buffer++);
+	kfree_s(res, buflen + 1);
+	return i;
+}
--- a/fs/open.c
+++ b/fs/open.c
@@ -416,7 +416,7 @@ int close_fp(struct file *filp)
 		return 0;
 	}
 	inode = filp->f_inode;
-	if (S_ISREG(inode->i_mode))
+	if (inode && S_ISREG(inode->i_mode))
 		fcntl_remove_locks(current, filp);
 	if (filp->f_count > 1) {
 		filp->f_count--;

--- a/fs/proc/.depend
+++ b/fs/proc/.depend
+array.o : array.c /usr/include/linux/types.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/asm/segment.h \
+  /usr/include/asm/io.h 
+base.o : base.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
+fd.o : fd.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
+inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
+  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
+  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
+  /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h \
+  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
+  /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/math_emu.h /usr/include/linux/proc_fs.h /usr/include/linux/string.h \
+  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
+  /usr/include/asm/segment.h 
+link.o : link.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/minix_fs.h /usr/include/linux/stat.h 
+mem.o : mem.c /usr/include/linux/types.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
+  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
+  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/nfs_fs_i.h \
+  /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
+  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/nfs_fs_sb.h \
+  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
+  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
+  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/asm/segment.h \
+  /usr/include/asm/io.h 
+root.o : root.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
+  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
+  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
+  /usr/include/linux/nfs_fs_i.h /usr/include/linux/nfs.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
+  /usr/include/linux/nfs_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
+  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
+  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
+  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -20,83 +20,14 @@ proc.o: $(OBJS)
 	$(LD) -r -o proc.o $(OBJS)

 clean:
-	rm -f core *.o *.a tmp_make
-	for i in *.c;do rm -f `basename $$i .c`.s;done
+	rm -f core *.o *.a *.s

 dep:
-	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	$(CPP) -M *.c >> tmp_make
-	cp tmp_make Makefile
+	$(CPP) -M *.c > .depend

-### Dependencies:
-array.o : array.c /usr/include/linux/types.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/asm/segment.h \
-  /usr/include/asm/io.h 
-base.o : base.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
-fd.o : fd.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
-inode.o : inode.c /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
-  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/types.h \
-  /usr/include/linux/dirent.h /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h \
-  /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h \
-  /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h \
-  /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h \
-  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
-  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
-  /usr/include/linux/math_emu.h /usr/include/linux/proc_fs.h /usr/include/linux/string.h \
-  /usr/include/linux/stat.h /usr/include/linux/locks.h /usr/include/asm/system.h \
-  /usr/include/asm/segment.h 
-link.o : link.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/minix_fs.h /usr/include/linux/stat.h 
-mem.o : mem.c /usr/include/linux/types.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/dirent.h /usr/include/linux/vfs.h \
-  /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h /usr/include/linux/ext_fs_i.h \
-  /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h /usr/include/linux/minix_fs_sb.h \
-  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/iso_fs_sb.h \
-  /usr/include/linux/mm.h /usr/include/linux/kernel.h /usr/include/linux/signal.h \
-  /usr/include/linux/time.h /usr/include/linux/param.h /usr/include/linux/resource.h \
-  /usr/include/linux/vm86.h /usr/include/linux/math_emu.h /usr/include/asm/segment.h \
-  /usr/include/asm/io.h 
-root.o : root.c /usr/include/asm/segment.h /usr/include/linux/errno.h /usr/include/linux/sched.h \
-  /usr/include/linux/head.h /usr/include/linux/fs.h /usr/include/linux/limits.h \
-  /usr/include/linux/wait.h /usr/include/linux/types.h /usr/include/linux/dirent.h \
-  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
-  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/iso_fs_i.h \
-  /usr/include/linux/minix_fs_sb.h /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h \
-  /usr/include/linux/iso_fs_sb.h /usr/include/linux/mm.h /usr/include/linux/kernel.h \
-  /usr/include/linux/signal.h /usr/include/linux/time.h /usr/include/linux/param.h \
-  /usr/include/linux/resource.h /usr/include/linux/vm86.h /usr/include/linux/math_emu.h \
-  /usr/include/linux/proc_fs.h /usr/include/linux/stat.h 
+#
+# include a dependency file if one exists
+#
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -53,7 +53,8 @@ static struct proc_dir_entry root_dir[] = {
 	{ 1,2,".." },
 	{ 2,7,"loadavg" },
 	{ 3,6,"uptime" },
-	{ 4,7,"meminfo" }
+	{ 4,7,"meminfo" },
+	{ 5,4,"self" }	/* will change inode # */
 };

 #define NR_ROOT_DIRENTRY ((sizeof (root_dir))/(sizeof (root_dir[0])))
@@ -80,6 +81,8 @@ static int proc_lookuproot(struct inode * dir,const char * name, int len,
 			*result = dir;
 			return 0;
 		}
+		if (ino == 5) /* self modifying inode ... */
+			ino = (current->pid << 16) + 2;
 	} else {
 		pid = 0;
 		while (len-- > 0) {

--- a/include/asm/irq.h
+++ b/include/asm/irq.h
--- a/include/linux/autoconf.h
+++ b/include/linux/autoconf.h
--- a/include/linux/config.dist.h
+++ b/include/linux/config.dist.h
--- a/include/linux/config.h
+++ b/include/linux/config.h
--- a/include/linux/config.site.h
+++ b/include/linux/config.site.h
-#ifndef _LINUX_CONFIG_SITE_H
-#define _LINUX_CONFIG_SITE_H
-
-/*
-	This configuration file contains site specific things, things 
-	that you have added and config.dist will not know about.
-*/
-
-#endif
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
--- a/include/linux/mouse.h
+++ b/include/linux/mouse.h
--- a/include/linux/mtio.h
+++ b/include/linux/mtio.h
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/nfs_fs_i.h
+++ b/include/linux/nfs_fs_i.h
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
--- a/include/linux/termios.h
+++ b/include/linux/termios.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/init/main.c
+++ b/init/main.c
--- a/kernel/.depend
+++ b/kernel/.depend
--- a/kernel/FPU-emu/.depend
+++ b/kernel/FPU-emu/.depend
--- a/kernel/FPU-emu/Makefile
+++ b/kernel/FPU-emu/Makefile
--- a/kernel/FPU-emu/fpu_entry.c
+++ b/kernel/FPU-emu/fpu_entry.c
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/blk_drv/.depend
+++ b/kernel/blk_drv/.depend
--- a/kernel/blk_drv/Makefile
+++ b/kernel/blk_drv/Makefile
--- a/kernel/blk_drv/floppy.c
+++ b/kernel/blk_drv/floppy.c
--- a/kernel/blk_drv/hd.c
+++ b/kernel/blk_drv/hd.c
--- a/kernel/blk_drv/ll_rw_blk.c
+++ b/kernel/blk_drv/ll_rw_blk.c
--- a/kernel/blk_drv/scsi/.depend
+++ b/kernel/blk_drv/scsi/.depend
--- a/kernel/blk_drv/scsi/Makefile
+++ b/kernel/blk_drv/scsi/Makefile
--- a/kernel/blk_drv/scsi/Makefile.in
+++ b/kernel/blk_drv/scsi/Makefile.in
--- a/kernel/blk_drv/scsi/aha1542.c
+++ b/kernel/blk_drv/scsi/aha1542.c
--- a/kernel/blk_drv/scsi/aha1740.c
+++ b/kernel/blk_drv/scsi/aha1740.c
--- a/kernel/blk_drv/scsi/fdomain.c
+++ b/kernel/blk_drv/scsi/fdomain.c
--- a/kernel/blk_drv/scsi/hosts.c
+++ b/kernel/blk_drv/scsi/hosts.c
--- a/kernel/blk_drv/scsi/scsi.c
+++ b/kernel/blk_drv/scsi/scsi.c
--- a/kernel/blk_drv/scsi/scsi.h
+++ b/kernel/blk_drv/scsi/scsi.h
--- a/kernel/blk_drv/scsi/scsi_ioctl.c
+++ b/kernel/blk_drv/scsi/scsi_ioctl.c
--- a/kernel/blk_drv/scsi/sd.c
+++ b/kernel/blk_drv/scsi/sd.c
--- a/kernel/blk_drv/scsi/sd_ioctl.c
+++ b/kernel/blk_drv/scsi/sd_ioctl.c
--- a/kernel/blk_drv/scsi/seagate.c
+++ b/kernel/blk_drv/scsi/seagate.c
--- a/kernel/blk_drv/scsi/sr.c
+++ b/kernel/blk_drv/scsi/sr.c
--- a/kernel/blk_drv/scsi/st.c
+++ b/kernel/blk_drv/scsi/st.c
--- a/kernel/blk_drv/scsi/st.h
+++ b/kernel/blk_drv/scsi/st.h
--- a/kernel/blk_drv/scsi/ultrastor.c
+++ b/kernel/blk_drv/scsi/ultrastor.c
--- a/kernel/blk_drv/scsi/wd7000.c
+++ b/kernel/blk_drv/scsi/wd7000.c
--- a/kernel/blk_drv/scsi/wd7000.h
+++ b/kernel/blk_drv/scsi/wd7000.h
--- a/kernel/chr_drv/.depend
+++ b/kernel/chr_drv/.depend
--- a/kernel/chr_drv/Makefile
+++ b/kernel/chr_drv/Makefile
--- a/kernel/chr_drv/console.c
+++ b/kernel/chr_drv/console.c
--- a/kernel/chr_drv/mem.c
+++ b/kernel/chr_drv/mem.c
--- a/kernel/chr_drv/mouse.c
+++ b/kernel/chr_drv/mouse.c
--- a/kernel/chr_drv/psaux.c
+++ b/kernel/chr_drv/psaux.c
--- a/kernel/chr_drv/pty.c
+++ b/kernel/chr_drv/pty.c
--- a/kernel/chr_drv/serial.c
+++ b/kernel/chr_drv/serial.c
--- a/kernel/chr_drv/sound/.depend
+++ b/kernel/chr_drv/sound/.depend
--- a/kernel/chr_drv/sound/Makefile
+++ b/kernel/chr_drv/sound/Makefile
--- a/kernel/chr_drv/sound/sound_stub.c
+++ b/kernel/chr_drv/sound/sound_stub.c
--- a/kernel/chr_drv/tty_io.c
+++ b/kernel/chr_drv/tty_io.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/irq.c
+++ b/kernel/irq.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/traps.c
+++ b/kernel/traps.c
--- a/lib/.depend
+++ b/lib/.depend
--- a/lib/Makefile
+++ b/lib/Makefile
--- a/mm/.depend
+++ b/mm/.depend
--- a/mm/Makefile
+++ b/mm/Makefile
--- a/net/.depend
+++ b/net/.depend
--- a/net/Makefile
+++ b/net/Makefile
--- a/net/socket.c
+++ b/net/socket.c
--- a/net/tcp/.depend
+++ b/net/tcp/.depend
--- a/net/tcp/Makefile
+++ b/net/tcp/Makefile
--- a/net/tcp/Space.c
+++ b/net/tcp/Space.c
--- a/net/tcp/arp.c
+++ b/net/tcp/arp.c
--- a/net/tcp/arp.h
+++ b/net/tcp/arp.h
--- a/net/tcp/dev.c
+++ b/net/tcp/dev.c
--- a/net/tcp/dev.h
+++ b/net/tcp/dev.h
--- a/net/tcp/eth.c
+++ b/net/tcp/eth.c
--- a/net/tcp/icmp.c
+++ b/net/tcp/icmp.c
--- a/net/tcp/ip.c
+++ b/net/tcp/ip.c
--- a/net/tcp/loopback.c
+++ b/net/tcp/loopback.c
--- a/net/tcp/pack_type.c
+++ b/net/tcp/pack_type.c
--- a/net/tcp/packet.c
+++ b/net/tcp/packet.c
--- a/net/tcp/raw.c
+++ b/net/tcp/raw.c
--- a/net/tcp/sock.c
+++ b/net/tcp/sock.c
--- a/net/tcp/sock.h
+++ b/net/tcp/sock.h
--- a/net/tcp/tcp.c
+++ b/net/tcp/tcp.c
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
--- a/net/tcp/timer.c
+++ b/net/tcp/timer.c
--- a/net/tcp/udp.c
+++ b/net/tcp/udp.c
--- a/net/tcp/we.c
+++ b/net/tcp/we.c
--- a/net/unix.c
+++ b/net/unix.c
--- a/tools/version.h
+++ b/tools/version.h