must have vnode locked before doing ufs_access

[unix-history] / usr / src / sys / ufs / lfs / lfs_vnops.c

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index dc3b398..2f7079b 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)lfs_vnops.c 7.27 (Berkeley) %G%
+ *     @(#)lfs_vnops.c 7.38 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -25,15 +25,15 @@
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"

-#include "uio.h"

 #include "socket.h"
 #include "socketvar.h"
 #include "conf.h"
 #include "mount.h"
 #include "vnode.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "conf.h"
 #include "mount.h"
 #include "vnode.h"

+#include "specdev.h"
+#include "../ufs/quota.h"

 #include "../ufs/inode.h"
 #include "../ufs/fs.h"
 #include "../ufs/inode.h"
 #include "../ufs/fs.h"

-#include "../ufs/quota.h"

 
 /*
  * Global vfs data structures for ufs
 
 /*
  * Global vfs data structures for ufs


@@ -69,7 +69,8 @@ int   ufs_lookup(),
        ufs_unlock(),
        ufs_bmap(),
        ufs_strategy(),
        ufs_unlock(),
        ufs_bmap(),
        ufs_strategy(),

-       ufs_print();
+       ufs_print(),
+       ufs_islocked();

 
 struct vnodeops ufs_vnodeops = {
        ufs_lookup,             /* lookup */
 
 struct vnodeops ufs_vnodeops = {
        ufs_lookup,             /* lookup */


@@ -103,6 +104,7 @@ struct vnodeops ufs_vnodeops = {
        ufs_bmap,               /* bmap */
        ufs_strategy,           /* strategy */
        ufs_print,              /* print */
        ufs_bmap,               /* bmap */
        ufs_strategy,           /* strategy */
        ufs_print,              /* print */

+       ufs_islocked,           /* islocked */

 };
 
 int    spec_lookup(),
 };
 
 int    spec_lookup(),


@@ -149,13 +151,64 @@ struct vnodeops spec_inodeops = {
        spec_bmap,              /* bmap */
        spec_strategy,          /* strategy */
        ufs_print,              /* print */
        spec_bmap,              /* bmap */
        spec_strategy,          /* strategy */
        ufs_print,              /* print */

+       ufs_islocked,           /* islocked */

 };
 
 };
 

-enum vtype iftovt_tab[8] = {
-       VNON, VCHR, VDIR, VBLK, VREG, VLNK, VSOCK, VBAD,
+#ifdef FIFO
+int    fifo_lookup(),
+       fifo_open(),
+       ufsfifo_read(),
+       ufsfifo_write(),
+       fifo_bmap(),
+       fifo_ioctl(),
+       fifo_select(),
+       ufsfifo_close(),
+       fifo_print(),
+       fifo_badop(),
+       fifo_nullop();
+
+struct vnodeops fifo_inodeops = {
+       fifo_lookup,            /* lookup */
+       fifo_badop,             /* create */
+       fifo_badop,             /* mknod */
+       fifo_open,              /* open */
+       ufsfifo_close,          /* close */
+       ufs_access,             /* access */
+       ufs_getattr,            /* getattr */
+       ufs_setattr,            /* setattr */
+       ufsfifo_read,           /* read */
+       ufsfifo_write,          /* write */
+       fifo_ioctl,             /* ioctl */
+       fifo_select,            /* select */
+       fifo_badop,             /* mmap */
+       fifo_nullop,            /* fsync */
+       fifo_badop,             /* seek */
+       fifo_badop,             /* remove */
+       fifo_badop,             /* link */
+       fifo_badop,             /* rename */
+       fifo_badop,             /* mkdir */
+       fifo_badop,             /* rmdir */
+       fifo_badop,             /* symlink */
+       fifo_badop,             /* readdir */
+       fifo_badop,             /* readlink */
+       fifo_badop,             /* abortop */
+       ufs_inactive,           /* inactive */
+       ufs_reclaim,            /* reclaim */
+       ufs_lock,               /* lock */
+       ufs_unlock,             /* unlock */
+       fifo_bmap,              /* bmap */
+       fifo_badop,             /* strategy */
+       ufs_print,              /* print */
+       ufs_islocked,           /* islocked */

 };
 };

-int    vttoif_tab[8] = {
-       0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFMT,
+#endif /* FIFO */
+
+enum vtype iftovt_tab[16] = {
+       VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
+       VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
+};
+int    vttoif_tab[9] = {
+       0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFIFO, IFMT,

 };
 
 /*
 };
 
 /*


@@ -189,21 +242,21 @@ ufs_mknod(ndp, vap, cred)
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);

-       vp = ITOV(ip);
-       if (vap->va_rdev) {
+       ip->i_flag |= IACC|IUPD|ICHG;
+       if (vap->va_rdev != VNOVAL) {

                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
                 */
                ip->i_rdev = vap->va_rdev;
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
                 */
                ip->i_rdev = vap->va_rdev;

-               ip->i_flag |= IACC|IUPD|ICHG;

        }
        /*
         * Remove inode so that it will be reloaded by iget and
         * checked to see if it is an alias of an existing entry
         * in the inode cache.
         */
        }
        /*
         * Remove inode so that it will be reloaded by iget and
         * checked to see if it is an alias of an existing entry
         * in the inode cache.
         */

-       iput(ip);
+       vp = ITOV(ip);
+       vput(vp);

        vp->v_type = VNON;
        vgone(vp);
        return (0);
        vp->v_type = VNON;
        vgone(vp);
        return (0);


@@ -242,13 +295,58 @@ ufs_close(vp, fflag, cred)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Check mode permission on inode pointer. Mode is READ, WRITE or EXEC.
+ * The mode is shifted to select the owner/group/other fields. The
+ * super user is granted all permissions.
+ */

 ufs_access(vp, mode, cred)
        struct vnode *vp;
 ufs_access(vp, mode, cred)
        struct vnode *vp;

-       int mode;
+       register int mode;

        struct ucred *cred;
 {
        struct ucred *cred;
 {

+       register struct inode *ip = VTOI(vp);
+       register gid_t *gp;
+       int i, error;

 
 

-       return (iaccess(VTOI(vp), mode, cred));
+#ifdef DIAGNOSTIC
+       if (!VOP_ISLOCKED(vp)) {
+               vprint("ufs_access: not locked", vp);
+               panic("ufs_access: not locked");
+       }
+#endif
+#ifdef QUOTA
+       if (mode & VWRITE) {
+               switch (vp->v_type) {
+               case VREG: case VDIR: case VLNK:
+                       if (error = getinoquota(ip))
+                               return (error);
+               }
+       }
+#endif /* QUOTA */
+       /*
+        * If you're the super-user, you always get access.
+        */
+       if (cred->cr_uid == 0)
+               return (0);
+       /*
+        * Access check is based on only one of owner, group, public.
+        * If not owner, then check group. If not a member of the
+        * group, then check public access.
+        */
+       if (cred->cr_uid != ip->i_uid) {
+               mode >>= 3;
+               gp = cred->cr_groups;
+               for (i = 0; i < cred->cr_ngroups; i++, gp++)
+                       if (ip->i_gid == *gp)
+                               goto found;
+               mode >>= 3;
+found:
+               ;
+       }
+       if ((ip->i_mode & mode) != 0)
+               return (0);
+       return (EACCES);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -270,8 +368,12 @@ ufs_getattr(vp, vap, cred)
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;

-       vap->va_size = ip->i_din.di_qsize.val[0];
-       vap->va_size1 = ip->i_din.di_qsize.val[1];
+#ifdef tahoe
+       vap->va_size = ip->i_size;
+       vap->va_size_rsv = 0;
+#else
+       vap->va_qsize = ip->i_din.di_qsize;
+#endif

        vap->va_atime.tv_sec = ip->i_atime;
        vap->va_atime.tv_usec = 0;
        vap->va_mtime.tv_sec = ip->i_mtime;
        vap->va_atime.tv_sec = ip->i_atime;
        vap->va_atime.tv_usec = 0;
        vap->va_mtime.tv_sec = ip->i_mtime;


@@ -288,7 +390,7 @@ ufs_getattr(vp, vap, cred)
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
        vap->va_bytes = dbtob(ip->i_blocks);
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
        vap->va_bytes = dbtob(ip->i_blocks);

-       vap->va_bytes1 = -1;
+       vap->va_bytes_rsv = 0;

        vap->va_type = vp->v_type;
        return (0);
 }
        vap->va_type = vp->v_type;
        return (0);
 }


@@ -394,10 +496,13 @@ chown1(vp, uid, gid, cred)
        struct ucred *cred;
 {
        register struct inode *ip = VTOI(vp);
        struct ucred *cred;
 {
        register struct inode *ip = VTOI(vp);

+       uid_t ouid;
+       gid_t ogid;
+       int error = 0;

 #ifdef QUOTA
 #ifdef QUOTA

-       register long change;
+       register int i;
+       long change;

 #endif
 #endif

-       int error;

 
        if (uid == (u_short)VNOVAL)
                uid = ip->i_uid;
 
        if (uid == (u_short)VNOVAL)
                uid = ip->i_uid;


@@ -412,30 +517,74 @@ chown1(vp, uid, gid, cred)
            !groupmember((gid_t)gid, cred)) &&
            (error = suser(cred, &u.u_acflag)))
                return (error);
            !groupmember((gid_t)gid, cred)) &&
            (error = suser(cred, &u.u_acflag)))
                return (error);

+       ouid = ip->i_uid;
+       ogid = ip->i_gid;

 #ifdef QUOTA
 #ifdef QUOTA

-       if (ip->i_uid == uid)           /* this just speeds things a little */
-               change = 0;
-       else
-               change = ip->i_blocks;
-       (void) chkdq(ip, -change, 1);
-       (void) chkiq(ip->i_dev, ip, ip->i_uid, 1);
-       dqrele(ip->i_dquot);
+       if (error = getinoquota(ip))
+               return (error);
+       if (ouid == uid) {
+               dqrele(vp, ip->i_dquot[USRQUOTA]);
+               ip->i_dquot[USRQUOTA] = NODQUOT;
+       }
+       if (ogid == gid) {
+               dqrele(vp, ip->i_dquot[GRPQUOTA]);
+               ip->i_dquot[GRPQUOTA] = NODQUOT;
+       }
+       change = ip->i_blocks;
+       (void) chkdq(ip, -change, cred, CHOWN);
+       (void) chkiq(ip, -1, cred, CHOWN);
+       for (i = 0; i < MAXQUOTAS; i++) {
+               dqrele(vp, ip->i_dquot[i]);
+               ip->i_dquot[i] = NODQUOT;
+       }

 #endif
 #endif

-       if (ip->i_uid != uid && cred->cr_uid != 0)
-               ip->i_mode &= ~ISUID;
-       if (ip->i_gid != gid && cred->cr_uid != 0)
-               ip->i_mode &= ~ISGID;

        ip->i_uid = uid;
        ip->i_gid = gid;
        ip->i_uid = uid;
        ip->i_gid = gid;

-       ip->i_flag |= ICHG;

 #ifdef QUOTA
 #ifdef QUOTA

-       ip->i_dquot = inoquota(ip);
-       (void) chkdq(ip, change, 1);
-       (void) chkiq(ip->i_dev, (struct inode *)NULL, (uid_t)uid, 1);
-       return (u.u_error);             /* should == 0 ALWAYS !! */
-#else
-       return (0);
+       if ((error = getinoquota(ip)) == 0) {
+               if (ouid == uid) {
+                       dqrele(vp, ip->i_dquot[USRQUOTA]);
+                       ip->i_dquot[USRQUOTA] = NODQUOT;
+               }
+               if (ogid == gid) {
+                       dqrele(vp, ip->i_dquot[GRPQUOTA]);
+                       ip->i_dquot[GRPQUOTA] = NODQUOT;
+               }
+               if ((error = chkdq(ip, change, cred, CHOWN)) == 0) {
+                       if ((error = chkiq(ip, 1, cred, CHOWN)) == 0)
+                               return (0);
+                       else
+                               (void) chkdq(ip, -change, cred, CHOWN|FORCE);
+               }
+               for (i = 0; i < MAXQUOTAS; i++) {
+                       dqrele(vp, ip->i_dquot[i]);
+                       ip->i_dquot[i] = NODQUOT;
+               }
+       }
+       ip->i_uid = ouid;
+       ip->i_gid = ogid;
+       if (getinoquota(ip) == 0) {
+               if (ouid == uid) {
+                       dqrele(vp, ip->i_dquot[USRQUOTA]);
+                       ip->i_dquot[USRQUOTA] = NODQUOT;
+               }
+               if (ogid == gid) {
+                       dqrele(vp, ip->i_dquot[GRPQUOTA]);
+                       ip->i_dquot[GRPQUOTA] = NODQUOT;
+               }
+               (void) chkdq(ip, change, cred, FORCE);
+               (void) chkiq(ip, 1, cred, FORCE);
+       }
+       if (error)
+               return (error);

 #endif
 #endif

+       if (ouid != uid || ogid != gid)
+               ip->i_flag |= ICHG;
+       if (ouid != uid && cred->cr_uid != 0)
+               ip->i_mode &= ~ISUID;
+       if (ogid != gid && cred->cr_uid != 0)
+               ip->i_mode &= ~ISGID;
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -603,9 +752,9 @@ ufs_ioctl(vp, com, data, fflag, cred)
 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

-ufs_select(vp, which, cred)
+ufs_select(vp, which, fflags, cred)

        struct vnode *vp;
        struct vnode *vp;

-       int which;
+       int which, fflags;

        struct ucred *cred;
 {
 
        struct ucred *cred;
 {
 


@@ -803,7 +952,10 @@ ufs_rename(fndp, tndp)
        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {
        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {

-               if (error = iaccess(ip, IWRITE, tndp->ni_cred))
+               VOP_LOCK(fndp->ni_vp);
+               error = ufs_access(fndp->ni_vp, VWRITE, tndp->ni_cred);
+               VOP_UNLOCK(fndp->ni_vp);
+               if (error)

                        goto bad;
                tndp->ni_nameiop = RENAME | LOCKPARENT | LOCKLEAF | NOCACHE;
                do {
                        goto bad;
                tndp->ni_nameiop = RENAME | LOCKPARENT | LOCKLEAF | NOCACHE;
                do {


@@ -1023,25 +1175,26 @@ ufs_mkdir(ndp, vap)
         * directory.  The entry is made later
         * after writing "." and ".." entries out.
         */
         * directory.  The entry is made later
         * after writing "." and ".." entries out.
         */

-       error = ialloc(dp, dirpref(dp->i_fs), dmode, &tip);
-       if (error) {
+       if (error = ialloc(dp, dirpref(dp->i_fs), dmode, ndp->ni_cred, &tip)) {

                iput(dp);
                return (error);
        }
        ip = tip;
                iput(dp);
                return (error);
        }
        ip = tip;

+       ip->i_uid = ndp->ni_cred->cr_uid;
+       ip->i_gid = dp->i_gid;

 #ifdef QUOTA
 #ifdef QUOTA

-       if (ip->i_dquot != NODQUOT)
-               panic("mkdir: dquot");
+       if ((error = getinoquota(ip)) ||
+           (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
+               ifree(ip, ip->i_number, dmode);
+               iput(ip);
+               iput(dp);
+               return (error);
+       }

 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;
        ITOV(ip)->v_type = VDIR;        /* Rest init'd in iget() */
        ip->i_nlink = 2;
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;
        ITOV(ip)->v_type = VDIR;        /* Rest init'd in iget() */
        ip->i_nlink = 2;

-       ip->i_uid = ndp->ni_cred->cr_uid;
-       ip->i_gid = dp->i_gid;
-#ifdef QUOTA
-       ip->i_dquot = inoquota(ip);
-#endif

        error = iupdat(ip, &time, &time, 1);
 
        /*
        error = iupdat(ip, &time, &time, 1);
 
        /*


@@ -1192,10 +1345,11 @@ ufs_symlink(ndp, vap, target)
 /*
  * Vnode op for read and write
  */
 /*
  * Vnode op for read and write
  */

-ufs_readdir(vp, uio, cred)
+ufs_readdir(vp, uio, cred, eofflagp)

        struct vnode *vp;
        register struct uio *uio;
        struct ucred *cred;
        struct vnode *vp;
        register struct uio *uio;
        struct ucred *cred;

+       int *eofflagp;

 {
        int count, lost, error;
 
 {
        int count, lost, error;
 


@@ -1208,6 +1362,10 @@ ufs_readdir(vp, uio, cred)
        uio->uio_iov->iov_len = count;
        error = ufs_read(vp, uio, 0, cred);
        uio->uio_resid += lost;
        uio->uio_iov->iov_len = count;
        error = ufs_read(vp, uio, 0, cred);
        uio->uio_resid += lost;

+       if ((VTOI(vp)->i_size - uio->uio_offset) <= 0)
+               *eofflagp = 1;
+       else
+               *eofflagp = 0;

        return (error);
 }
 
        return (error);
 }
 


@@ -1230,23 +1388,23 @@ ufs_readlink(vp, uiop, cred)
 ufs_abortop(ndp)
        register struct nameidata *ndp;
 {
 ufs_abortop(ndp)
        register struct nameidata *ndp;
 {

-       register struct inode *ip;

 
 

-       if (ndp->ni_vp) {
-               ip = VTOI(ndp->ni_vp);
-               if (ip->i_flag & ILOCKED)
-                       IUNLOCK(ip);
-               vrele(ndp->ni_vp);
-       }

        if (ndp->ni_dvp) {
        if (ndp->ni_dvp) {

-               ip = VTOI(ndp->ni_dvp);
-               if (ip->i_flag & ILOCKED)
-                       IUNLOCK(ip);
+               if (VOP_ISLOCKED(ndp->ni_dvp))
+                       VOP_UNLOCK(ndp->ni_dvp);

                vrele(ndp->ni_dvp);
        }
                vrele(ndp->ni_dvp);
        }

+       if (ndp->ni_vp) {
+               if (VOP_ISLOCKED(ndp->ni_vp))
+                       VOP_UNLOCK(ndp->ni_vp);
+               vrele(ndp->ni_vp);
+       }

        return;
 }
 
        return;
 }
 

+/*
+ * Lock an inode.
+ */

 ufs_lock(vp)
        struct vnode *vp;
 {
 ufs_lock(vp)
        struct vnode *vp;
 {


@@ -1256,6 +1414,9 @@ ufs_lock(vp)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Unlock an inode.
+ */

 ufs_unlock(vp)
        struct vnode *vp;
 {
 ufs_unlock(vp)
        struct vnode *vp;
 {


@@ -1267,6 +1428,18 @@ ufs_unlock(vp)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Check for a locked inode.
+ */
+ufs_islocked(vp)
+       struct vnode *vp;
+{
+
+       if (VTOI(vp)->i_flag & ILOCKED)
+               return (1);
+       return (0);
+}
+

 /*
  * Get access to bmap
  */
 /*
  * Get access to bmap
  */


@@ -1318,7 +1491,7 @@ ufs_strategy(bp)
                last = start + btodb(bp->b_bcount) - 1;
                for (ep = buf; ep < ebp; ep++) {
                        if (ep == bp || (ep->b_flags & B_INVAL) ||
                last = start + btodb(bp->b_bcount) - 1;
                for (ep = buf; ep < ebp; ep++) {
                        if (ep == bp || (ep->b_flags & B_INVAL) ||

-                           ep->b_vp == (struct vnode *)0)
+                           ep->b_vp == NULLVP)

                                continue;
                        if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0))
                                continue;
                                continue;
                        if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0))
                                continue;


@@ -1348,9 +1521,19 @@ ufs_print(vp)
 {
        register struct inode *ip = VTOI(vp);
 
 {
        register struct inode *ip = VTOI(vp);
 

-       printf("tag VT_UFS, ino %d, on dev %d, %d%s\n", ip->i_number,
-               major(ip->i_dev), minor(ip->i_dev),
-               (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
+       printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
+               major(ip->i_dev), minor(ip->i_dev));
+#ifdef FIFO
+       if (vp->v_type == VFIFO)
+               fifo_printinfo(vp);
+#endif /* FIFO */
+       printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
+       if (ip->i_spare0 == 0)
+               return;
+       printf("\towner pid %d", ip->i_spare0);
+       if (ip->i_spare1)
+               printf(" waiting pid %d", ip->i_spare1);
+       printf("\n");

 }
 
 /*
 }
 
 /*


@@ -1404,6 +1587,59 @@ ufsspec_close(vp, fflag, cred)
        return (spec_close(vp, fflag, cred));
 }
 
        return (spec_close(vp, fflag, cred));
 }
 

+#ifdef FIFO
+/*
+ * Read wrapper for fifo's
+ */
+ufsfifo_read(vp, uio, ioflag, cred)
+       struct vnode *vp;
+       struct uio *uio;
+       int ioflag;
+       struct ucred *cred;
+{
+
+       /*
+        * Set access flag.
+        */
+       VTOI(vp)->i_flag |= IACC;
+       return (fifo_read(vp, uio, ioflag, cred));
+}
+
+/*
+ * Write wrapper for fifo's.
+ */
+ufsfifo_write(vp, uio, ioflag, cred)
+       struct vnode *vp;
+       struct uio *uio;
+       int ioflag;
+       struct ucred *cred;
+{
+
+       /*
+        * Set update and change flags.
+        */
+       VTOI(vp)->i_flag |= IUPD|ICHG;
+       return (fifo_write(vp, uio, ioflag, cred));
+}
+
+/*
+ * Close wrapper for fifo's.
+ *
+ * Update the times on the inode then do device close.
+ */
+ufsfifo_close(vp, fflag, cred)
+       struct vnode *vp;
+       int fflag;
+       struct ucred *cred;
+{
+       register struct inode *ip = VTOI(vp);
+
+       if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
+               ITIMES(ip, &time, &time);
+       return (fifo_close(vp, fflag, cred));
+}
+#endif /* FIFO */
+

 /*
  * Make a new file.
  */
 /*
  * Make a new file.
  */


@@ -1419,49 +1655,57 @@ maknode(mode, ndp, ipp)
        int error;
 
        *ipp = 0;
        int error;
 
        *ipp = 0;

+       if ((mode & IFMT) == 0)
+               mode |= IFREG;

        if ((mode & IFMT) == IFDIR)
                ipref = dirpref(pdir->i_fs);
        else
                ipref = pdir->i_number;
        if ((mode & IFMT) == IFDIR)
                ipref = dirpref(pdir->i_fs);
        else
                ipref = pdir->i_number;

-       error = ialloc(pdir, ipref, mode, &tip);
-       if (error) {
+       if (error = ialloc(pdir, ipref, mode, ndp->ni_cred, &tip)) {

                iput(pdir);
                return (error);
        }
        ip = tip;
                iput(pdir);
                return (error);
        }
        ip = tip;

+       ip->i_uid = ndp->ni_cred->cr_uid;
+       ip->i_gid = pdir->i_gid;

 #ifdef QUOTA
 #ifdef QUOTA

-       if (ip->i_dquot != NODQUOT)
-               panic("maknode: dquot");
+       if ((error = getinoquota(ip)) ||
+           (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
+               ifree(ip, ip->i_number, mode);
+               iput(ip);
+               iput(pdir);
+               return (error);
+       }

 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;

-       if ((mode & IFMT) == 0)
-               mode |= IFREG;

        ip->i_mode = mode;
        ITOV(ip)->v_type = IFTOVT(mode);        /* Rest init'd in iget() */
        ip->i_nlink = 1;
        ip->i_mode = mode;
        ITOV(ip)->v_type = IFTOVT(mode);        /* Rest init'd in iget() */
        ip->i_nlink = 1;

-       ip->i_uid = ndp->ni_cred->cr_uid;
-       ip->i_gid = pdir->i_gid;

        if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
            suser(ndp->ni_cred, NULL))
                ip->i_mode &= ~ISGID;
        if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
            suser(ndp->ni_cred, NULL))
                ip->i_mode &= ~ISGID;

-#ifdef QUOTA
-       ip->i_dquot = inoquota(ip);
-#endif

 
        /*
         * Make sure inode goes to disk before directory entry.
         */
 
        /*
         * Make sure inode goes to disk before directory entry.
         */

-       if ((error = iupdat(ip, &time, &time, 1)) ||
-           (error = direnter(ip, ndp))) {
-               /*
-                * Write error occurred trying to update the inode
-                * or the directory so must deallocate the inode.
-                */
-               ip->i_nlink = 0;
-               ip->i_flag |= ICHG;
-               iput(ip);
-               return (error);
+       if (error = iupdat(ip, &time, &time, 1))
+               goto bad;
+       if (error = direnter(ip, ndp)) {
+               pdir = NULL;
+               goto bad;

        }
        *ipp = ip;
        return (0);
        }
        *ipp = ip;
        return (0);

+
+bad:
+       /*
+        * Write error occurred trying to update the inode
+        * or the directory so must deallocate the inode.
+        */
+       if (pdir)
+               iput(pdir);
+       ip->i_nlink = 0;
+       ip->i_flag |= ICHG;
+       iput(ip);
+       return (error);

 }
 }