rid of NFILE

SCCS-vsn: sys/kern/vfs_vnops.c 4.5
SCCS-vsn: sys/kern/kern_proc.c 4.6

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 4497220..b49b65d 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     4.5     %G%     */
+/*     kern_proc.c     4.6     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -301,7 +301,7 @@ register struct inode *ip;
        if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
                register struct file *fp;
 
        if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
                register struct file *fp;
 

-               for (fp = file; fp < &file[NFILE]; fp++)
+               for (fp = file; fp < fileNFILE; fp++)

                        if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
                                u.u_error = ETXTBSY;
                                goto bad;
                        if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
                                u.u_error = ETXTBSY;
                                goto bad;

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index f63b48b..f3d7218 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -1,4 +1,4 @@
-/*     vfs_vnops.c     4.4     %G%     */
+/*     vfs_vnops.c     4.5     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -100,7 +100,7 @@ register struct file *fp;
        }
 
        if ((flag & FMP) == 0) {
        }
 
        if ((flag & FMP) == 0) {

-               for(fp=file; fp < &file[NFILE]; fp++)
+               for(fp=file; fp < fileNFILE; fp++)

                        if (fp->f_count && (ip=fp->f_inode)->i_un.i_rdev==dev &&
                            (ip->i_mode&IFMT) == mode)
                                return;
                        if (fp->f_count && (ip=fp->f_inode)->i_un.i_rdev==dev &&
                            (ip->i_mode&IFMT) == mode)
                                return;


@@ -270,7 +270,7 @@ falloc()
        i = ufalloc();
        if(i < 0)
                return(NULL);
        i = ufalloc();
        if(i < 0)
                return(NULL);

-       for(fp = lastf; fp < &file[NFILE]; fp++)
+       for(fp = lastf; fp < fileNFILE; fp++)

                if(fp->f_count == 0)
                        goto slot;
        for(fp = &file[0]; fp < lastf; fp++)
                if(fp->f_count == 0)
                        goto slot;
        for(fp = &file[0]; fp < lastf; fp++)