u. is gone, pcb is at p_addr; aston => signotify

[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 a50e716..71548ff 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -2,40 +2,24 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

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

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

-#include "user.h"

 #include "kernel.h"
 #include "file.h"
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"
 #include "kernel.h"
 #include "file.h"
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"

-#include "uio.h"
-#include "socket.h"
-#include "socketvar.h"

 #include "mount.h"
 #include "mount.h"

+#include "namei.h"

 #include "vnode.h"
 #include "vnode.h"

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

 #include "ioctl.h"
 #include "tty.h"
 
 #include "ioctl.h"
 #include "tty.h"
 

-int    vn_read(), vn_write(), vn_ioctl(), vn_select(), vn_close();

 struct         fileops vnops =
        { vn_read, vn_write, vn_ioctl, vn_select, vn_close };
 
 struct         fileops vnops =
        { vn_read, vn_write, vn_ioctl, vn_select, vn_close };
 


@@ -43,11 +27,13 @@ struct      fileops vnops =
  * Common code for vnode open operations.
  * Check permissions, and call the VOP_OPEN or VOP_CREATE routine.
  */
  * Common code for vnode open operations.
  * Check permissions, and call the VOP_OPEN or VOP_CREATE routine.
  */

-vn_open(ndp, fmode, cmode)
+vn_open(ndp, p, fmode, cmode)

        register struct nameidata *ndp;
        register struct nameidata *ndp;

+       struct proc *p;

        int fmode, cmode;
 {
        register struct vnode *vp;
        int fmode, cmode;
 {
        register struct vnode *vp;

+       register struct ucred *cred = p->p_ucred;

        struct vattr vat;
        struct vattr *vap = &vat;
        int error;
        struct vattr vat;
        struct vattr *vap = &vat;
        int error;


@@ -56,21 +42,23 @@ vn_open(ndp, fmode, cmode)
                ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;
                if ((fmode & FEXCL) == 0)
                        ndp->ni_nameiop |= FOLLOW;
                ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;
                if ((fmode & FEXCL) == 0)
                        ndp->ni_nameiop |= FOLLOW;

-               if (error = namei(ndp))
+               if (error = namei(ndp, p))

                        return (error);
                if (ndp->ni_vp == NULL) {
                        return (error);
                if (ndp->ni_vp == NULL) {

-                       vattr_null(vap);
+                       VATTR_NULL(vap);

                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        vap->va_type = VREG;
                        vap->va_mode = cmode;

-                       if (error = VOP_CREATE(ndp, vap))
+                       if (error = VOP_CREATE(ndp, vap, p))

                                return (error);
                        fmode &= ~FTRUNC;
                        vp = ndp->ni_vp;
                } else {
                                return (error);
                        fmode &= ~FTRUNC;
                        vp = ndp->ni_vp;
                } else {

+                       if (ndp->ni_dvp == ndp->ni_vp)
+                               vrele(ndp->ni_dvp);
+                       else
+                               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;


@@ -79,7 +67,7 @@ vn_open(ndp, fmode, cmode)
                }
        } else {
                ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
                }
        } else {
                ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;

-               if (error = namei(ndp))
+               if (error = namei(ndp, p))

                        return (error);
                vp = ndp->ni_vp;
        }
                        return (error);
                vp = ndp->ni_vp;
        }


@@ -89,7 +77,7 @@ vn_open(ndp, fmode, cmode)
        }
        if ((fmode & FCREAT) == 0) {
                if (fmode & FREAD) {
        }
        if ((fmode & FCREAT) == 0) {
                if (fmode & FREAD) {

-                       if (error = VOP_ACCESS(vp, VREAD, ndp->ni_cred))
+                       if (error = VOP_ACCESS(vp, VREAD, cred, p))

                                goto bad;
                }
                if (fmode & (FWRITE|FTRUNC)) {
                                goto bad;
                }
                if (fmode & (FWRITE|FTRUNC)) {


@@ -98,30 +86,25 @@ vn_open(ndp, fmode, cmode)
                                goto bad;
                        }
                        if ((error = vn_writechk(vp)) ||
                                goto bad;
                        }
                        if ((error = vn_writechk(vp)) ||

-                           (error = VOP_ACCESS(vp, VWRITE, ndp->ni_cred)))
+                           (error = VOP_ACCESS(vp, VWRITE, cred, p)))

                                goto bad;
                }
        }
        if (fmode & FTRUNC) {
                                goto bad;
                }
        }
        if (fmode & FTRUNC) {

-               vattr_null(vap);
+               VATTR_NULL(vap);

                vap->va_size = 0;
                vap->va_size = 0;

-               if (error = VOP_SETATTR(vp, vap, ndp->ni_cred))
+               if (error = VOP_SETATTR(vp, vap, cred, p))

                        goto bad;
        }
        VOP_UNLOCK(vp);
                        goto bad;
        }
        VOP_UNLOCK(vp);

-       if (setjmp(&u.u_qsave)) {
-               if (error == 0)
-                       error = EINTR;
-               return (error);
-       }
-       error = VOP_OPEN(vp, fmode, ndp->ni_cred);
+       error = VOP_OPEN(vp, fmode, cred, p);

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

-       return(error);
+       return (error);

 }
 
 /*
 }
 
 /*


@@ -138,17 +121,18 @@ vn_writechk(vp)
         * unless the file is a socket or a block or character
         * device resident on the file system.
         */
         * unless the file is a socket or a block or character
         * device resident on the file system.
         */

-       if ((vp->v_mount->m_flag & M_RDONLY) && vp->v_type != VCHR &&
-           vp->v_type != VBLK && vp->v_type != VSOCK)
-               return (EROFS);
+       if (vp->v_mount->mnt_flag & MNT_RDONLY) {
+               switch (vp->v_type) {
+               case VREG: case VDIR: case VLNK:
+                       return (EROFS);
+               }
+       }

        /*
         * If there's shared text associated with
         * the vnode, try to free it up once.  If
         * we fail, we can't allow writing.
         */
        /*
         * If there's shared text associated with
         * the vnode, try to free it up once.  If
         * we fail, we can't allow writing.
         */

-       if (vp->v_flag & VTEXT)
-               xrele(vp);
-       if (vp->v_flag & VTEXT)
+       if ((vp->v_flag & VTEXT) && !vnode_pager_uncache(vp))

                return (ETXTBSY);
        return (0);
 }
                return (ETXTBSY);
        return (0);
 }


@@ -156,7 +140,7 @@ vn_writechk(vp)
 /*
  * Vnode version of rdwri() for calls on file systems.
  */
 /*
  * Vnode version of rdwri() for calls on file systems.
  */

-vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid)
+vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, p)

        enum uio_rw rw;
        struct vnode *vp;
        caddr_t base;
        enum uio_rw rw;
        struct vnode *vp;
        caddr_t base;


@@ -166,11 +150,14 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid)
        int ioflg;
        struct ucred *cred;
        int *aresid;
        int ioflg;
        struct ucred *cred;
        int *aresid;

+       struct proc *p;

 {
        struct uio auio;
        struct iovec aiov;
        int error;
 
 {
        struct uio auio;
        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;


@@ -179,15 +166,18 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid)
        auio.uio_offset = offset;
        auio.uio_segflg = segflg;
        auio.uio_rw = rw;
        auio.uio_offset = offset;
        auio.uio_segflg = segflg;
        auio.uio_rw = rw;

+       auio.uio_procp = p;

        if (rw == UIO_READ)
        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);
 }
 


@@ -196,9 +186,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)


@@ -207,21 +204,31 @@ 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);

 }
 
 /*
  * Get stat info for a vnode.
  */
 }
 
 /*
  * Get stat info for a vnode.
  */

-vn_stat(vp, sb)
+vn_stat(vp, sb, p)

        struct vnode *vp;
        register struct stat *sb;
        struct vnode *vp;
        register struct stat *sb;

+       struct proc *p;

 {
        struct vattr vattr;
        register struct vattr *vap;
 {
        struct vattr vattr;
        register struct vattr *vap;


@@ -229,7 +236,7 @@ vn_stat(vp, sb)
        u_short mode;
 
        vap = &vattr;
        u_short mode;
 
        vap = &vattr;

-       error = VOP_GETATTR(vp, vap, u.u_cred);
+       error = VOP_GETATTR(vp, vap, p->p_ucred, p);

        if (error)
                return (error);
        /*
        if (error)
                return (error);
        /*


@@ -257,6 +264,9 @@ vn_stat(vp, sb)
        case VSOCK:
                mode |= S_IFSOCK;
                break;
        case VSOCK:
                mode |= S_IFSOCK;
                break;

+       case VFIFO:
+               mode |= S_IFIFO;
+               break;

        default:
                return (EBADF);
        };
        default:
                return (EBADF);
        };


@@ -282,10 +292,11 @@ vn_stat(vp, sb)
 /*
  * Vnode ioctl call
  */
 /*
  * Vnode ioctl call
  */

-vn_ioctl(fp, com, data)
+vn_ioctl(fp, com, data, p)

        struct file *fp;
        int com;
        caddr_t data;
        struct file *fp;
        int com;
        caddr_t data;

+       struct proc *p;

 {
        register struct vnode *vp = ((struct vnode *)fp->f_data);
        struct vattr vattr;
 {
        register struct vnode *vp = ((struct vnode *)fp->f_data);
        struct vattr vattr;


@@ -296,7 +307,7 @@ vn_ioctl(fp, com, data)
        case VREG:
        case VDIR:
                if (com == FIONREAD) {
        case VREG:
        case VDIR:
                if (com == FIONREAD) {

-                       if (error = VOP_GETATTR(vp, &vattr, u.u_cred))
+                       if (error = VOP_GETATTR(vp, &vattr, p->p_ucred, p))

                                return (error);
                        *(off_t *)data = vattr.va_size - fp->f_offset;
                        return (0);
                                return (error);
                        *(off_t *)data = vattr.va_size - fp->f_offset;
                        return (0);


@@ -308,18 +319,12 @@ vn_ioctl(fp, com, data)
        default:
                return (ENOTTY);
 
        default:
                return (ENOTTY);
 

+       case VFIFO:

        case VCHR:
        case VBLK:
        case VCHR:
        case VBLK:

-               u.u_r.r_val1 = 0;
-               if (setjmp(&u.u_qsave)) {
-                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
-                               return(EINTR);
-                       u.u_eosys = RESTARTSYS;
-                       return (0);
-               }
-               error = VOP_IOCTL(vp, com, data, fp->f_flag, u.u_cred);
+               error = VOP_IOCTL(vp, com, data, fp->f_flag, p->p_ucred, p);

                if (error == 0 && com == TIOCSCTTY) {
                if (error == 0 && com == TIOCSCTTY) {

-                       u.u_procp->p_session->s_ttyvp = vp;
+                       p->p_session->s_ttyvp = vp;

                        VREF(vp);
                }
                return (error);
                        VREF(vp);
                }
                return (error);


@@ -329,144 +334,37 @@ vn_ioctl(fp, com, data)
 /*
  * Vnode select call
  */
 /*
  * Vnode select call
  */

-vn_select(fp, which)
+vn_select(fp, which, p)

        struct file *fp;
        int which;
        struct file *fp;
        int which;

+       struct proc *p;

 {
 {

-       return(VOP_SELECT(((struct vnode *)fp->f_data), which, u.u_cred));
+
+       return (VOP_SELECT(((struct vnode *)fp->f_data), which, fp->f_flag,
+               p->p_ucred, p));

 }
 
 /*
  * Vnode close call
  */
 }
 
 /*
  * Vnode close call
  */

-vn_close(fp)
+vn_close(fp, p)

        register struct file *fp;
        register struct file *fp;

+       struct proc *p;

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

-       if (fp->f_flag & (FSHLOCK|FEXLOCK))
-               vn_unlock(fp, FSHLOCK|FEXLOCK);

        /*
         * 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;
        /*
         * 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, u.u_cred);
+       error = VOP_CLOSE(vp, fp->f_flag, fp->f_cred, p);

        vrele(vp);
        return (error);
 }
 
        vrele(vp);
        return (error);
 }
 

-/*
- * Place an advisory lock on a vnode.
- * !! THIS IMPLIES THAT ALL STATEFUL FILE SERVERS WILL USE file table entries
- */
-vn_lock(fp, cmd)
-       register struct file *fp;
-       int cmd;
-{
-       register int priority = PLOCK;
-       register struct vnode *vp = (struct vnode *)fp->f_data;
-
-       if ((cmd & LOCK_EX) == 0)
-               priority += 4;
-       if (setjmp(&u.u_qsave)) {
-               if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
-                       return(EINTR);
-               u.u_eosys = RESTARTSYS;
-               return (0);
-       }
-       /*
-        * If there's a exclusive lock currently applied
-        * to the file, then we've gotta wait for the
-        * lock with everyone else.
-        */
-again:
-       while (vp->v_flag & VEXLOCK) {
-               /*
-                * If we're holding an exclusive
-                * lock, then release it.
-                */
-               if (fp->f_flag & FEXLOCK) {
-                       vn_unlock(fp, FEXLOCK);
-                       continue;
-               }
-               if (cmd & LOCK_NB)
-                       return (EWOULDBLOCK);
-               vp->v_flag |= VLWAIT;
-               sleep((caddr_t)&vp->v_exlockc, priority);
-       }
-       if ((cmd & LOCK_EX) && (vp->v_flag & VSHLOCK)) {
-               /*
-                * Must wait for any shared locks to finish
-                * before we try to apply a exclusive lock.
-                *
-                * If we're holding a shared
-                * lock, then release it.
-                */
-               if (fp->f_flag & FSHLOCK) {
-                       vn_unlock(fp, FSHLOCK);
-                       goto again;
-               }
-               if (cmd & LOCK_NB)
-                       return (EWOULDBLOCK);
-               vp->v_flag |= VLWAIT;
-               sleep((caddr_t)&vp->v_shlockc, PLOCK);
-               goto again;
-       }
-       if (fp->f_flag & FEXLOCK)
-               panic("vn_lock");
-       if (cmd & LOCK_EX) {
-               cmd &= ~LOCK_SH;
-               vp->v_exlockc++;
-               vp->v_flag |= VEXLOCK;
-               fp->f_flag |= FEXLOCK;
-       }
-       if ((cmd & LOCK_SH) && (fp->f_flag & FSHLOCK) == 0) {
-               vp->v_shlockc++;
-               vp->v_flag |= VSHLOCK;
-               fp->f_flag |= FSHLOCK;
-       }
-       return (0);
-}
-
-/*
- * Unlock a file.
- */
-vn_unlock(fp, kind)
-       register struct file *fp;
-       int kind;
-{
-       register struct vnode *vp = (struct vnode *)fp->f_data;
-       int flags;
-
-       kind &= fp->f_flag;
-       if (vp == NULL || kind == 0)
-               return;
-       flags = vp->v_flag;
-       if (kind & FSHLOCK) {
-               if ((flags & VSHLOCK) == 0)
-                       panic("vn_unlock: SHLOCK");
-               if (--vp->v_shlockc == 0) {
-                       vp->v_flag &= ~VSHLOCK;
-                       if (flags & VLWAIT)
-                               wakeup((caddr_t)&vp->v_shlockc);
-               }
-               fp->f_flag &= ~FSHLOCK;
-       }
-       if (kind & FEXLOCK) {
-               if ((flags & VEXLOCK) == 0)
-                       panic("vn_unlock: EXLOCK");
-               if (--vp->v_exlockc == 0) {
-                       vp->v_flag &= ~(VEXLOCK|VLWAIT);
-                       if (flags & VLWAIT)
-                               wakeup((caddr_t)&vp->v_exlockc);
-               }
-               fp->f_flag &= ~FEXLOCK;
-       }
-}
-

 /*
  * vn_fhtovp() - convert a fh to a vnode ptr (optionally locked)
  *     - look up fsid in mount list (if not found ret error)
 /*
  * vn_fhtovp() - convert a fh to a vnode ptr (optionally locked)
  *     - look up fsid in mount list (if not found ret error)


@@ -488,21 +386,3 @@ vn_fhtovp(fhp, lockflag, vpp)
                VOP_UNLOCK(*vpp);
        return (0);
 }
                VOP_UNLOCK(*vpp);
        return (0);
 }

-
-/*
- * Noop
- */
-vfs_noop()
-{
-
-       return (ENXIO);
-}
-
-/*
- * Null op
- */
-vfs_nullop()
-{
-
-       return (0);
-}