getkerninfo skipped defaults ``dupedkeyed'' behind the root node;

[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 618e9fd..2662c2e 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.13 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.20 (Berkeley) %G%

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


@@ -30,8 +30,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 +57,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))


@@ -105,17 +103,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);


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

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

 }
 
 /*
 }
 
 /*


@@ -140,7 +133,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);
        /*


@@ -279,6 +272,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);
        };


@@ -330,15 +326,10 @@ vn_ioctl(fp, com, data)
        default:
                return (ENOTTY);
 
        default:
                return (ENOTTY);
 

+       case VFIFO:

        case VCHR:
        case VBLK:
                u.u_r.r_val1 = 0;
        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;


@@ -355,7 +346,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));

 }
 
 /*
 }
 
 /*


@@ -390,15 +382,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


@@ -417,9 +407,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.


@@ -434,8 +426,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");