fixes for fp context switching

[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 71548ff..984a939 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_vnops.c 7.29 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.33 (Berkeley) %G%

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


@@ -21,7 +21,7 @@
 #include "tty.h"
 
 struct         fileops vnops =
 #include "tty.h"
 
 struct         fileops vnops =

-       { vn_read, vn_write, vn_ioctl, vn_select, vn_close };
+       { vn_read, vn_write, vn_ioctl, vn_select, vn_closefile };

 
 /*
  * Common code for vnode open operations.
 
 /*
  * Common code for vnode open operations.


@@ -38,9 +38,9 @@ vn_open(ndp, p, fmode, cmode)
        struct vattr *vap = &vat;
        int error;
 
        struct vattr *vap = &vat;
        int error;
 

-       if (fmode & FCREAT) {
+       if (fmode & O_CREAT) {

                ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;
                ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;

-               if ((fmode & FEXCL) == 0)
+               if ((fmode & O_EXCL) == 0)

                        ndp->ni_nameiop |= FOLLOW;
                if (error = namei(ndp, p))
                        return (error);
                        ndp->ni_nameiop |= FOLLOW;
                if (error = namei(ndp, p))
                        return (error);


@@ -50,20 +50,21 @@ vn_open(ndp, p, fmode, cmode)
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap, p))
                                return (error);
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap, p))
                                return (error);

-                       fmode &= ~FTRUNC;
+                       fmode &= ~O_TRUNC;

                        vp = ndp->ni_vp;
                } else {
                        vp = ndp->ni_vp;
                } else {

+                       VOP_ABORTOP(ndp);

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

-                       if (fmode & FEXCL) {
+                       if (fmode & O_EXCL) {

                                error = EEXIST;
                                goto bad;
                        }
                                error = EEXIST;
                                goto bad;
                        }

-                       fmode &= ~FCREAT;
+                       fmode &= ~O_CREAT;

                }
        } else {
                ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
                }
        } else {
                ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;


@@ -75,12 +76,12 @@ vn_open(ndp, p, fmode, cmode)
                error = EOPNOTSUPP;
                goto bad;
        }
                error = EOPNOTSUPP;
                goto bad;
        }

-       if ((fmode & FCREAT) == 0) {
+       if ((fmode & O_CREAT) == 0) {

                if (fmode & FREAD) {
                        if (error = VOP_ACCESS(vp, VREAD, cred, p))
                                goto bad;
                }
                if (fmode & FREAD) {
                        if (error = VOP_ACCESS(vp, VREAD, cred, p))
                                goto bad;
                }

-               if (fmode & (FWRITE|FTRUNC)) {
+               if (fmode & (FWRITE | O_TRUNC)) {

                        if (vp->v_type == VDIR) {
                                error = EISDIR;
                                goto bad;
                        if (vp->v_type == VDIR) {
                                error = EISDIR;
                                goto bad;


@@ -90,18 +91,17 @@ vn_open(ndp, p, fmode, cmode)
                                goto bad;
                }
        }
                                goto bad;
                }
        }

-       if (fmode & FTRUNC) {
+       if (fmode & O_TRUNC) {

                VATTR_NULL(vap);
                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, cred, p))
                        goto bad;
        }
                VATTR_NULL(vap);
                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, cred, p))
                        goto bad;
        }

-       VOP_UNLOCK(vp);
-       error = VOP_OPEN(vp, fmode, cred, p);
-       if (error)
-               vrele(vp);
-       return (error);
-
+       if (error = VOP_OPEN(vp, fmode, cred, p))
+               goto bad;
+       if (fmode & FWRITE)
+               vp->v_writecount++;
+       return (0);

 bad:
        vput(vp);
        return (error);
 bad:
        vput(vp);
        return (error);


@@ -138,7 +138,25 @@ vn_writechk(vp)
 }
 
 /*
 }
 
 /*

- * Vnode version of rdwri() for calls on file systems.
+ * Vnode close call
+ */
+vn_close(vp, flags, cred, p)
+       register struct vnode *vp;
+       int flags;
+       struct ucred *cred;
+       struct proc *p;
+{
+       int error;
+
+       if (flags & FWRITE)
+               vp->v_writecount--;
+       error = VOP_CLOSE(vp, flags, cred, p);
+       vrele(vp);
+       return (error);
+}
+
+/*
+ * Package up an I/O request on a vnode into a uio and do it.

  */
 vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, p)
        enum uio_rw rw;
  */
 vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, p)
        enum uio_rw rw;


@@ -181,6 +199,9 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, p)
        return (error);
 }
 
        return (error);
 }
 

+/*
+ * File table vnode read routine.
+ */

 vn_read(fp, uio, cred)
        struct file *fp;
        struct uio *uio;
 vn_read(fp, uio, cred)
        struct file *fp;
        struct uio *uio;


@@ -192,12 +213,16 @@ vn_read(fp, uio, cred)
        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
        count = uio->uio_resid;
        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);
+       error = VOP_READ(vp, uio, (fp->f_flag & FNONBLOCK) ? IO_NDELAY : 0,
+               cred);

        fp->f_offset += count - uio->uio_resid;
        VOP_UNLOCK(vp);
        return (error);
 }
 
        fp->f_offset += count - uio->uio_resid;
        VOP_UNLOCK(vp);
        return (error);
 }
 

+/*
+ * File table vnode write routine.
+ */

 vn_write(fp, uio, cred)
        struct file *fp;
        struct uio *uio;
 vn_write(fp, uio, cred)
        struct file *fp;
        struct uio *uio;


@@ -206,9 +231,9 @@ vn_write(fp, uio, cred)
        register struct vnode *vp = (struct vnode *)fp->f_data;
        int count, error, ioflag = 0;
 
        register struct vnode *vp = (struct vnode *)fp->f_data;
        int count, error, ioflag = 0;
 

-       if (vp->v_type == VREG && (fp->f_flag & FAPPEND))
+       if (vp->v_type == VREG && (fp->f_flag & O_APPEND))

                ioflag |= IO_APPEND;
                ioflag |= IO_APPEND;

-       if (fp->f_flag & FNDELAY)
+       if (fp->f_flag & FNONBLOCK)

                ioflag |= IO_NDELAY;
        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
                ioflag |= IO_NDELAY;
        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;


@@ -223,7 +248,7 @@ vn_write(fp, uio, cred)
 }
 
 /*
 }
 
 /*

- * Get stat info for a vnode.
+ * File table vnode stat routine.

  */
 vn_stat(vp, sb, p)
        struct vnode *vp;
  */
 vn_stat(vp, sb, p)
        struct vnode *vp;


@@ -290,7 +315,7 @@ vn_stat(vp, sb, p)
 }
 
 /*
 }
 
 /*

- * Vnode ioctl call
+ * File table vnode ioctl routine.

  */
 vn_ioctl(fp, com, data, p)
        struct file *fp;
  */
 vn_ioctl(fp, com, data, p)
        struct file *fp;


@@ -332,7 +357,7 @@ vn_ioctl(fp, com, data, p)
 }
 
 /*
 }
 
 /*

- * Vnode select call
+ * File table vnode select routine.

  */
 vn_select(fp, which, p)
        struct file *fp;
  */
 vn_select(fp, which, p)
        struct file *fp;


@@ -341,28 +366,19 @@ vn_select(fp, which, p)
 {
 
        return (VOP_SELECT(((struct vnode *)fp->f_data), which, fp->f_flag,
 {
 
        return (VOP_SELECT(((struct vnode *)fp->f_data), which, fp->f_flag,

-               p->p_ucred, p));
+               fp->f_cred, p));

 }
 
 /*
 }
 
 /*

- * Vnode close call
+ * File table vnode close routine.

  */
  */

-vn_close(fp, p)
-       register struct file *fp;
+vn_closefile(fp, p)
+       struct file *fp;

        struct proc *p;
 {
        struct proc *p;
 {

-       struct vnode *vp = ((struct vnode *)fp->f_data);
-       int error;

 
 

-       /*
-        * Must delete vnode reference from this file entry
-        * before VOP_CLOSE, so that only other references
-        * will prevent close.
-        */
-       fp->f_data = (caddr_t) 0;
-       error = VOP_CLOSE(vp, fp->f_flag, fp->f_cred, p);
-       vrele(vp);
-       return (error);
+       return (vn_close(((struct vnode *)fp->f_data), fp->f_flag,
+               fp->f_cred, p));

 }
 
 /*
 }
 
 /*