VOP_ABORTOP is no longer responsible for unlocking and vreleing vnodes

[unix-history] / usr / src / sys / ufs / ffs / ffs_vnops.c

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index d5d5bad..2f83032 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_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.
  *

- *     @(#)ffs_vnops.c 7.33 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.42 (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


@@ -295,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 */


@@ -323,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;


@@ -341,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);
 }


@@ -447,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;


@@ -465,30 +517,77 @@ 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
+       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)
+                               goto good;
+                       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|CHOWN);
+               (void) chkiq(ip, 1, cred, FORCE|CHOWN);
+               (void) getinoquota(ip);
+       }
+       return (error);
+good:
+       if (getinoquota(ip))
+               panic("chown: lost quota");
+#endif /* QUOTA */
+       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);
        return (0);

-#endif

 }
 
 /*
 }
 
 /*


@@ -813,9 +912,13 @@ ufs_rename(fndp, tndp)
                 */
                if ((d->d_namlen == 1 && d->d_name[0] == '.') || dp == ip ||
                    fndp->ni_isdotdot || (ip->i_flag & IRENAME)) {
                 */
                if ((d->d_namlen == 1 && d->d_name[0] == '.') || dp == ip ||
                    fndp->ni_isdotdot || (ip->i_flag & IRENAME)) {

-                       IUNLOCK(ip);
-                       ufs_abortop(fndp);
-                       ufs_abortop(tndp);
+                       VOP_ABORTOP(tndp);
+                       vput(tndp->ni_dvp);
+                       if (tndp->ni_vp)
+                               vput(tndp->ni_vp);
+                       VOP_ABORTOP(fndp);
+                       vrele(fndp->ni_dvp);
+                       vput(fndp->ni_vp);

                        return (EINVAL);
                }
                ip->i_flag |= IRENAME;
                        return (EINVAL);
                }
                ip->i_flag |= IRENAME;


@@ -856,7 +959,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 {


@@ -1076,25 +1182,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);
 
        /*


@@ -1283,23 +1390,14 @@ ufs_readlink(vp, uiop, cred)
 
 /*
  * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually
 
 /*
  * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually

- * done. Iff ni_vp/ni_dvp not null and locked, unlock.
+ * done. Nothing to do at the moment.

  */
  */

+/* ARGSUSED */

 ufs_abortop(ndp)
 ufs_abortop(ndp)

-       register struct nameidata *ndp;
+       struct nameidata *ndp;

 {
 
 {
 

-       if (ndp->ni_dvp) {
-               if (VOP_ISLOCKED(ndp->ni_dvp))
-                       VOP_UNLOCK(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 (0);

 }
 
 /*
 }
 
 /*


@@ -1355,22 +1453,20 @@ ufs_bmap(vp, bn, vpp, bnp)
                *vpp = ip->i_devvp;
        if (bnp == NULL)
                return (0);
                *vpp = ip->i_devvp;
        if (bnp == NULL)
                return (0);

-       return (bmap(ip, bn, bnp, (daddr_t *)0, (int *)0));
+       return (bmap(ip, bn, bnp));

 }
 
 /*
 }
 
 /*

- * Just call the device strategy routine
+ * Calculate the logical to physical mapping if not done already,
+ * then call the device strategy routine.

  */
  */

-int checkoverlap = 1;
+int checkoverlap = 0;

 
 ufs_strategy(bp)
        register struct buf *bp;
 {
        register struct inode *ip = VTOI(bp->b_vp);
 
 ufs_strategy(bp)
        register struct buf *bp;
 {
        register struct inode *ip = VTOI(bp->b_vp);

-       register struct buf *ep;

        struct vnode *vp;
        struct vnode *vp;

-       struct buf *ebp;
-       daddr_t start, last;

        int error;
 
        if (bp->b_vp->v_type == VBLK || bp->b_vp->v_type == VCHR)
        int error;
 
        if (bp->b_vp->v_type == VBLK || bp->b_vp->v_type == VCHR)


@@ -1385,13 +1481,18 @@ ufs_strategy(bp)
                biodone(bp);
                return (0);
        }
                biodone(bp);
                return (0);
        }

+#ifdef DIAGNOSTIC

        if (checkoverlap) {
        if (checkoverlap) {

+               register struct buf *ep;
+               struct buf *ebp;
+               daddr_t start, last;
+

                ebp = &buf[nbuf];
                start = bp->b_blkno;
                last = start + btodb(bp->b_bcount) - 1;
                for (ep = buf; ep < ebp; ep++) {
                        if (ep == bp || (ep->b_flags & B_INVAL) ||
                ebp = &buf[nbuf];
                start = bp->b_blkno;
                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;


@@ -1405,8 +1506,10 @@ ufs_strategy(bp)
                        printf("\tstart %d, end %d overlap start %d, end %d\n",
                                start, last, ep->b_blkno,
                                ep->b_blkno + btodb(ep->b_bcount) - 1);
                        printf("\tstart %d, end %d overlap start %d, end %d\n",
                                start, last, ep->b_blkno,
                                ep->b_blkno + btodb(ep->b_bcount) - 1);

+                       panic("Disk buffer overlap");

                }
        }
                }
        }

+#endif /* DIAGNOSTIC */

        vp = ip->i_devvp;
        bp->b_dev = vp->v_rdev;
        (*(vp->v_op->vn_strategy))(bp);
        vp = ip->i_devvp;
        bp->b_dev = vp->v_rdev;
        (*(vp->v_op->vn_strategy))(bp);


@@ -1555,49 +1658,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);

 }
 }