BSD 4_3_Reno release

[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..ecfd253 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -2,19 +2,22 @@
  * 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.
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may 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.

  *
  *

- *     @(#)vfs_vnops.c 7.11 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.23 (Berkeley) 6/28/90

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


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

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

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


@@ -59,7 +60,7 @@ vn_open(ndp, fmode, cmode)
                if (error = namei(ndp))
                        return (error);
                if (ndp->ni_vp == NULL) {
                if (error = namei(ndp))
                        return (error);
                if (ndp->ni_vp == NULL) {

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

                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap))
                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap))


@@ -67,10 +68,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
+                               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;


@@ -103,17 +106,12 @@ vn_open(ndp, fmode, cmode)
                }
        }
        if (fmode & FTRUNC) {
                }
        }
        if (fmode & FTRUNC) {

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

                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, ndp->ni_cred))
                        goto bad;
        }
        VOP_UNLOCK(vp);
                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, ndp->ni_cred))
                        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);
        if (error)
                vrele(vp);
        error = VOP_OPEN(vp, fmode, ndp->ni_cred);
        if (error)
                vrele(vp);


@@ -121,7 +119,7 @@ vn_open(ndp, fmode, cmode)
 
 bad:
        vput(vp);
 
 bad:
        vput(vp);

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

 }
 
 /*
 }
 
 /*


@@ -138,7 +136,7 @@ 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 &&
+       if ((vp->v_mount->mnt_flag & MNT_RDONLY) && vp->v_type != VCHR &&

            vp->v_type != VBLK && vp->v_type != VSOCK)
                return (EROFS);
        /*
            vp->v_type != VBLK && vp->v_type != VSOCK)
                return (EROFS);
        /*


@@ -171,6 +169,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;


@@ -180,14 +180,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);
 }
 


@@ -196,9 +198,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,13 +216,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);

 }
 
 /*
 }
 
 /*


@@ -257,6 +275,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);
        };


@@ -308,15 +329,9 @@ 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);
                if (error == 0 && com == TIOCSCTTY) {
                        u.u_procp->p_session->s_ttyvp = vp;
                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;


@@ -333,7 +348,8 @@ vn_select(fp, which)
        struct file *fp;
        int which;
 {
        struct file *fp;
        int which;
 {

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

 }
 
 /*
 }
 
 /*


@@ -368,15 +384,13 @@ vn_lock(fp, cmd)
 {
        register int priority = PLOCK;
        register struct vnode *vp = (struct vnode *)fp->f_data;
 {
        register int priority = PLOCK;
        register struct vnode *vp = (struct vnode *)fp->f_data;

+       int error = 0;
+       static char lockstr[] = "flock";

 
        if ((cmd & LOCK_EX) == 0)
                priority += 4;
 
        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);
-       }
+       priority |= PCATCH;
+

        /*
         * If there's a exclusive lock currently applied
         * to the file, then we've gotta wait for the
        /*
         * If there's a exclusive lock currently applied
         * to the file, then we've gotta wait for the


@@ -395,9 +409,11 @@ again:
                if (cmd & LOCK_NB)
                        return (EWOULDBLOCK);
                vp->v_flag |= VLWAIT;
                if (cmd & LOCK_NB)
                        return (EWOULDBLOCK);
                vp->v_flag |= VLWAIT;

-               sleep((caddr_t)&vp->v_exlockc, priority);
+               if (error = tsleep((caddr_t)&vp->v_exlockc, priority,
+                   lockstr, 0))
+                       return (error);

        }
        }

-       if ((cmd & LOCK_EX) && (vp->v_flag & VSHLOCK)) {
+       if (error = 0 && (cmd & LOCK_EX) && (vp->v_flag & VSHLOCK)) {

                /*
                 * Must wait for any shared locks to finish
                 * before we try to apply a exclusive lock.
                /*
                 * Must wait for any shared locks to finish
                 * before we try to apply a exclusive lock.


@@ -412,8 +428,9 @@ again:
                if (cmd & LOCK_NB)
                        return (EWOULDBLOCK);
                vp->v_flag |= VLWAIT;
                if (cmd & LOCK_NB)
                        return (EWOULDBLOCK);
                vp->v_flag |= VLWAIT;

-               sleep((caddr_t)&vp->v_shlockc, PLOCK);
-               goto again;
+               if (error = tsleep((caddr_t)&vp->v_shlockc, PLOCK | PCATCH,
+                   lockstr, 0) == 0)
+                       return (error);

        }
        if (fp->f_flag & FEXLOCK)
                panic("vn_lock");
        }
        if (fp->f_flag & FEXLOCK)
                panic("vn_lock");