reorganization to move ufsmount ops to be vnode ops;

[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 55d365e..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.31 (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.


@@ -97,8 +97,11 @@ vn_open(ndp, p, fmode, cmode)
                if (error = VOP_SETATTR(vp, vap, cred, p))
                        goto bad;
        }
                if (error = VOP_SETATTR(vp, vap, cred, p))
                        goto bad;
        }

-       if ((error = VOP_OPEN(vp, fmode, cred, p)) == 0)
-               return (0);
+       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);


@@ -135,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;


@@ -178,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;


@@ -196,6 +220,9 @@ vn_read(fp, uio, cred)
        return (error);
 }
 
        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;


@@ -221,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;


@@ -288,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;


@@ -330,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;


@@ -339,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));

 }
 
 /*
 }
 
 /*