blkflush is no longer used;

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

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 53f12b3..618e9fd 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_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.
  *

- *     @(#)vfs_vnops.c 7.9 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.13 (Berkeley) %G%

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


@@ -30,7 +30,6 @@
 #include "socketvar.h"
 #include "mount.h"
 #include "vnode.h"
 #include "socketvar.h"
 #include "mount.h"
 #include "vnode.h"

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

 #include "../ufs/fs.h"
 #include "../ufs/quota.h"
 #include "ioctl.h"
 #include "../ufs/fs.h"
 #include "../ufs/quota.h"
 #include "ioctl.h"


@@ -68,10 +67,12 @@ vn_open(ndp, fmode, cmode)
                        fmode &= ~FTRUNC;
                        vp = ndp->ni_vp;
                } else {
                        fmode &= ~FTRUNC;
                        vp = ndp->ni_vp;
                } else {

+                       if (ndp->ni_dvp == ndp->ni_vp)
+                               vrele(ndp->ni_dvp);
+                       else if (ndp->ni_dvp != NULL)
+                               vput(ndp->ni_dvp);
+                       ndp->ni_dvp = NULL;

                        vp = ndp->ni_vp;
                        vp = ndp->ni_vp;

-                       ndp->ni_vp = 0;
-                       VOP_ABORTOP(ndp);
-                       ndp->ni_vp = vp;

                        if (fmode & FEXCL) {
                                error = EEXIST;
                                goto bad;
                        if (fmode & FEXCL) {
                                error = EEXIST;
                                goto bad;


@@ -172,6 +173,8 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid)
        struct iovec aiov;
        int error;
 
        struct iovec aiov;
        int error;
 

+       if ((ioflg & IO_NODELOCKED) == 0)
+               VOP_LOCK(vp);

        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        aiov.iov_base = base;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        aiov.iov_base = base;


@@ -181,14 +184,16 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid)
        auio.uio_segflg = segflg;
        auio.uio_rw = rw;
        if (rw == UIO_READ)
        auio.uio_segflg = segflg;
        auio.uio_rw = rw;
        if (rw == UIO_READ)

-               error = VOP_READ(vp, &auio, &offset, ioflg, cred);
+               error = VOP_READ(vp, &auio, ioflg, cred);

        else
        else

-               error = VOP_WRITE(vp, &auio, &offset, ioflg, cred);
+               error = VOP_WRITE(vp, &auio, ioflg, cred);

        if (aresid)
                *aresid = auio.uio_resid;
        else
                if (auio.uio_resid && error == 0)
                        error = EIO;
        if (aresid)
                *aresid = auio.uio_resid;
        else
                if (auio.uio_resid && error == 0)
                        error = EIO;

+       if ((ioflg & IO_NODELOCKED) == 0)
+               VOP_UNLOCK(vp);

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


@@ -197,9 +202,16 @@ vn_read(fp, uio, cred)
        struct uio *uio;
        struct ucred *cred;
 {
        struct uio *uio;
        struct ucred *cred;
 {

+       register struct vnode *vp = (struct vnode *)fp->f_data;
+       int count, error;

 
 

-       return (VOP_READ((struct vnode *)fp->f_data, uio, &(fp->f_offset),
-               (fp->f_flag & FNDELAY) ? IO_NDELAY : 0, cred));
+       VOP_LOCK(vp);
+       uio->uio_offset = fp->f_offset;
+       count = uio->uio_resid;
+       error = VOP_READ(vp, uio, (fp->f_flag & FNDELAY) ? IO_NDELAY : 0, cred);
+       fp->f_offset += count - uio->uio_resid;
+       VOP_UNLOCK(vp);
+       return (error);

 }
 
 vn_write(fp, uio, cred)
 }
 
 vn_write(fp, uio, cred)


@@ -208,13 +220,22 @@ vn_write(fp, uio, cred)
        struct ucred *cred;
 {
        register struct vnode *vp = (struct vnode *)fp->f_data;
        struct ucred *cred;
 {
        register struct vnode *vp = (struct vnode *)fp->f_data;

-       int ioflag = 0;
+       int count, error, ioflag = 0;

 
        if (vp->v_type == VREG && (fp->f_flag & FAPPEND))
                ioflag |= IO_APPEND;
        if (fp->f_flag & FNDELAY)
                ioflag |= IO_NDELAY;
 
        if (vp->v_type == VREG && (fp->f_flag & FAPPEND))
                ioflag |= IO_APPEND;
        if (fp->f_flag & FNDELAY)
                ioflag |= IO_NDELAY;

-       return (VOP_WRITE(vp, uio, &(fp->f_offset), ioflag, cred));
+       VOP_LOCK(vp);
+       uio->uio_offset = fp->f_offset;
+       count = uio->uio_resid;
+       error = VOP_WRITE(vp, uio, ioflag, cred);
+       if (ioflag & IO_APPEND)
+               fp->f_offset = uio->uio_offset;
+       else
+               fp->f_offset += count - uio->uio_resid;
+       VOP_UNLOCK(vp);
+       return (error);

 }
 
 /*
 }
 
 /*


@@ -241,22 +262,22 @@ vn_stat(vp, sb)
        mode = vap->va_mode;
        switch (vp->v_type) {
        case VREG:
        mode = vap->va_mode;
        switch (vp->v_type) {
        case VREG:

-               mode |= IFREG;
+               mode |= S_IFREG;

                break;
        case VDIR:
                break;
        case VDIR:

-               mode |= IFDIR;
+               mode |= S_IFDIR;

                break;
        case VBLK:
                break;
        case VBLK:

-               mode |= IFBLK;
+               mode |= S_IFBLK;

                break;
        case VCHR:
                break;
        case VCHR:

-               mode |= IFCHR;
+               mode |= S_IFCHR;

                break;
        case VLNK:
                break;
        case VLNK:

-               mode |= IFLNK;
+               mode |= S_IFLNK;

                break;
        case VSOCK:
                break;
        case VSOCK:

-               mode |= IFSOCK;
+               mode |= S_IFSOCK;

                break;
        default:
                return (EBADF);
                break;
        default:
                return (EBADF);


@@ -318,7 +339,12 @@ vn_ioctl(fp, com, data)
                        u.u_eosys = RESTARTSYS;
                        return (0);
                }
                        u.u_eosys = RESTARTSYS;
                        return (0);
                }

-               return (VOP_IOCTL(vp, com, data, fp->f_flag, u.u_cred));
+               error = VOP_IOCTL(vp, com, data, fp->f_flag, u.u_cred);
+               if (error == 0 && com == TIOCSCTTY) {
+                       u.u_procp->p_session->s_ttyvp = vp;
+                       VREF(vp);
+               }
+               return (error);

        }
 }
 
        }
 }
 


@@ -475,7 +501,6 @@ vn_fhtovp(fhp, lockflag, vpp)
        struct vnode **vpp;
 {
        register struct mount *mp;
        struct vnode **vpp;
 {
        register struct mount *mp;

-       int error;

 
        if ((mp = getvfs(&fhp->fh_fsid)) == NULL)
                return (ESTALE);
 
        if ((mp = getvfs(&fhp->fh_fsid)) == NULL)
                return (ESTALE);


@@ -486,84 +511,6 @@ vn_fhtovp(fhp, lockflag, vpp)
        return (0);
 }
 
        return (0);
 }
 

-/*
- * Revoke access the current tty by all processes.
- * Used only by the super-user in init
- * to give ``clean'' terminals at login.
- */
-vhangup()
-{
-
-       if (u.u_error = suser(u.u_cred, &u.u_acflag))
-               return;
-       if (u.u_ttyp == NULL)
-               return;
-       forceclose(u.u_ttyd);
-       if ((u.u_ttyp->t_state) & TS_ISOPEN)
-               gsignal(u.u_ttyp->t_pgid, SIGHUP);
-       u.u_ttyp->t_session = 0;
-       u.u_ttyp->t_pgid = 0;
-}
-
-forceclose(dev)
-       dev_t dev;
-{
-       register struct file *fp;
-       register struct vnode *vp;
-
-       for (fp = file; fp < fileNFILE; fp++) {
-               if (fp->f_count == 0)
-                       continue;
-               if (fp->f_type != DTYPE_VNODE)
-                       continue;
-               vp = (struct vnode *)fp->f_data;
-               if (vp == 0)
-                       continue;
-               if (vp->v_type != VCHR)
-                       continue;
-               if (vp->v_rdev != dev)
-                       continue;
-               fp->f_flag &= ~(FREAD|FWRITE);
-       }
-}
-
-/*
- * Vnode reference, just increment the count
- */
-void vref(vp)
-       struct vnode *vp;
-{
-
-       vp->v_count++;
-}
-
-/*
- * Vnode release, just decrement the count and call VOP_INACTIVE()
- */
-void vrele(vp)
-       register struct vnode *vp;
-{
-
-       if (vp == NULL)
-               return;
-       vp->v_count--;
-       if (vp->v_count < 0)
-               printf("inode %d, bad ref count %d\n",
-                       VTOI(vp)->i_number, vp->v_count);
-       if (vp->v_count == 0)
-               VOP_INACTIVE(vp);
-}
-
-/*
- * vput(), just unlock and vrele()
- */
-vput(vp)
-       register struct vnode *vp;
-{
-       VOP_UNLOCK(vp);
-       vrele(vp);
-}
-

 /*
  * Noop
  */
 /*
  * Noop
  */