irele() becomes iunlock(); new irele() does iput() for already unlocked inodes

SCCS-vsn: sys/kern/kern_resource.c 4.7
SCCS-vsn: sys/kern/vfs_syscalls.c 4.25
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 4.25
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 4.25
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 4.25
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 4.25

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index e1d8d93..70bc347 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*     kern_resource.c 4.6     82/02/27        */
+/*     kern_resource.c 4.7     82/06/07        */

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


@@ -44,7 +44,7 @@ sysacct()
                        return;
                }
                acctp = ip;
                        return;
                }
                acctp = ip;

-               irele(ip);
+               iunlock(ip);

        }
 }
 
        }
 }
 


@@ -85,7 +85,7 @@ acct()
        writei(ip);
        if(u.u_error)
                ip->i_size = siz;
        writei(ip);
        if(u.u_error)
                ip->i_size = siz;

-       irele(ip);
+       iunlock(ip);

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index f293a30..1148176 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*     vfs_syscalls.c  4.24    82/06/04        */
+/*     vfs_syscalls.c  4.25    82/06/07        */

 
 #ifdef SIMFS
 #include "../h/sysrenam.h"
 
 #ifdef SIMFS
 #include "../h/sysrenam.h"


@@ -45,7 +45,7 @@ register struct inode **ipp;
        }
        if(access(ip, IEXEC))
                goto bad;
        }
        if(access(ip, IEXEC))
                goto bad;

-       irele(ip);
+       iunlock(ip);

        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);
        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);


@@ -124,7 +124,7 @@ open1(ip, mode, trf)
                goto out;
        if (trf == 1)
                itrunc(ip);
                goto out;
        if (trf == 1)
                itrunc(ip);

-       irele(ip);
+       iunlock(ip);

        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);
        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);


@@ -198,7 +198,7 @@ link()
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);

-       irele(ip);
+       iunlock(ip);

        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index aa65a77..89267be 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/*     ffs_vnops.c     4.24    82/06/04        */
+/*     ffs_vnops.c     4.25    82/06/07        */

 
 #ifdef SIMFS
 #include "../h/sysrenam.h"
 
 #ifdef SIMFS
 #include "../h/sysrenam.h"


@@ -45,7 +45,7 @@ register struct inode **ipp;
        }
        if(access(ip, IEXEC))
                goto bad;
        }
        if(access(ip, IEXEC))
                goto bad;

-       irele(ip);
+       iunlock(ip);

        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);
        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);


@@ -124,7 +124,7 @@ open1(ip, mode, trf)
                goto out;
        if (trf == 1)
                itrunc(ip);
                goto out;
        if (trf == 1)
                itrunc(ip);

-       irele(ip);
+       iunlock(ip);

        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);
        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);


@@ -198,7 +198,7 @@ link()
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);

-       irele(ip);
+       iunlock(ip);

        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 9344822..a68de3e 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.24    82/06/04        */
+/*     ufs_vnops.c     4.25    82/06/07        */

 
 #ifdef SIMFS
 #include "../h/sysrenam.h"
 
 #ifdef SIMFS
 #include "../h/sysrenam.h"


@@ -45,7 +45,7 @@ register struct inode **ipp;
        }
        if(access(ip, IEXEC))
                goto bad;
        }
        if(access(ip, IEXEC))
                goto bad;

-       irele(ip);
+       iunlock(ip);

        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);
        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);


@@ -124,7 +124,7 @@ open1(ip, mode, trf)
                goto out;
        if (trf == 1)
                itrunc(ip);
                goto out;
        if (trf == 1)
                itrunc(ip);

-       irele(ip);
+       iunlock(ip);

        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);
        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);


@@ -198,7 +198,7 @@ link()
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);

-       irele(ip);
+       iunlock(ip);

        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index aed5b78..91b7994 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*     lfs_vnops.c     4.24    82/06/04        */
+/*     lfs_vnops.c     4.25    82/06/07        */

 
 #ifdef SIMFS
 #include "../h/sysrenam.h"
 
 #ifdef SIMFS
 #include "../h/sysrenam.h"


@@ -45,7 +45,7 @@ register struct inode **ipp;
        }
        if(access(ip, IEXEC))
                goto bad;
        }
        if(access(ip, IEXEC))
                goto bad;

-       irele(ip);
+       iunlock(ip);

        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);
        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);


@@ -124,7 +124,7 @@ open1(ip, mode, trf)
                goto out;
        if (trf == 1)
                itrunc(ip);
                goto out;
        if (trf == 1)
                itrunc(ip);

-       irele(ip);
+       iunlock(ip);

        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);
        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);


@@ -198,7 +198,7 @@ link()
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);

-       irele(ip);
+       iunlock(ip);

        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 9344822..a68de3e 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.24    82/06/04        */
+/*     ufs_vnops.c     4.25    82/06/07        */

 
 #ifdef SIMFS
 #include "../h/sysrenam.h"
 
 #ifdef SIMFS
 #include "../h/sysrenam.h"


@@ -45,7 +45,7 @@ register struct inode **ipp;
        }
        if(access(ip, IEXEC))
                goto bad;
        }
        if(access(ip, IEXEC))
                goto bad;

-       irele(ip);
+       iunlock(ip);

        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);
        if (*ipp) {
                ilock(*ipp);
                iput(*ipp);


@@ -124,7 +124,7 @@ open1(ip, mode, trf)
                goto out;
        if (trf == 1)
                itrunc(ip);
                goto out;
        if (trf == 1)
                itrunc(ip);

-       irele(ip);
+       iunlock(ip);

        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);
        if ((fp = falloc()) == NULL)
                goto out;
        fp->f_flag = mode&(FREAD|FWRITE);


@@ -198,7 +198,7 @@ link()
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        iupdat(ip, &time, &time, 1);

-       irele(ip);
+       iunlock(ip);

        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        if (xp != NULL) {