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

[unix-history] / usr / src / sys / kern / vfs_syscalls.c

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) {