checkpoint (first pass at "...")

[unix-history] / usr / src / sys / miscfs / union / union_vnops.c

diff --git a/usr/src/sys/miscfs/union/union_vnops.c b/usr/src/sys/miscfs/union/union_vnops.c
index b147412..75c237c 100644 (file)
--- a/usr/src/sys/miscfs/union/union_vnops.c
+++ b/usr/src/sys/miscfs/union/union_vnops.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)union_vnops.c       8.9 (Berkeley) %G%
+ *     @(#)union_vnops.c       8.18 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -138,6 +138,22 @@ union_lookup(ap)
        struct union_mount *um = MOUNTTOUNIONMOUNT(dvp->v_mount);
        struct ucred *saved_cred;
 
        struct union_mount *um = MOUNTTOUNIONMOUNT(dvp->v_mount);
        struct ucred *saved_cred;
 

+#ifdef notyet
+       if (cnp->cn_namelen == 3 &&
+                       cnp->cn_nameptr[2] == '.' &&
+                       cnp->cn_nameptr[1] == '.' &&
+                       cnp->cn_nameptr[0] == '.') {
+               dvp = *ap->a_vpp = LOWERVP(ap->a_dvp);
+               if (dvp == NULLVP)
+                       return (ENOENT);
+               VREF(dvp);
+               VOP_LOCK(dvp);
+               if (!lockparent || !(cnp->cn_flags & ISLASTCN))
+                       VOP_UNLOCK(ap->a_dvp);
+               return (0);
+       }
+#endif
+

        cnp->cn_flags |= LOCKPARENT;
 
        upperdvp = dun->un_uppervp;
        cnp->cn_flags |= LOCKPARENT;
 
        upperdvp = dun->un_uppervp;


@@ -214,6 +230,14 @@ union_lookup(ap)
                }
        } else {
                lerror = ENOENT;
                }
        } else {
                lerror = ENOENT;

+               if ((cnp->cn_flags & ISDOTDOT) && dun->un_pvp != NULLVP) {
+                       lowervp = LOWERVP(dun->un_pvp);
+                       if (lowervp != NULLVP) {
+                               VREF(lowervp);
+                               VOP_LOCK(lowervp);
+                               lerror = 0;
+                       }
+               }

        }
 
        if (!lockparent)
        }
 
        if (!lockparent)


@@ -404,77 +428,7 @@ union_open(ap)
                 */
                tvp = un->un_lowervp;
                if ((ap->a_mode & FWRITE) && (tvp->v_type == VREG)) {
                 */
                tvp = un->un_lowervp;
                if ((ap->a_mode & FWRITE) && (tvp->v_type == VREG)) {

-                       struct vnode *vp;
-                       int i;
-
-                       /*
-                        * Open the named file in the upper layer.  Note that
-                        * the file may have come into existence *since* the
-                        * lookup was done, since the upper layer may really
-                        * be a loopback mount of some other filesystem...
-                        * so open the file with exclusive create and barf if
-                        * it already exists.
-                        * XXX - perhaps should re-lookup the node (once more
-                        * with feeling) and simply open that.  Who knows.
-                        */
-                       error = union_vn_create(&vp, un, p);
-                       if (error)
-                               return (error);
-
-                       /* at this point, uppervp is locked */
-                       union_newupper(un, vp);
-                       un->un_flags |= UN_ULOCK;
-
-                       /*
-                        * Now, if the file is being opened with truncation,
-                        * then the (new) upper vnode is ready to fly,
-                        * otherwise the data from the lower vnode must be
-                        * copied to the upper layer first.  This only works
-                        * for regular files (check is made above).
-                        */
-                       if ((mode & O_TRUNC) == 0) {
-                               /*
-                                * XXX - should not ignore errors
-                                * from VOP_CLOSE
-                                */
-                               VOP_LOCK(tvp);
-                               error = VOP_OPEN(tvp, FREAD, cred, p);
-                               if (error == 0) {
-                                       error = union_copyfile(p, cred,
-                                                      tvp, un->un_uppervp);
-                                       VOP_UNLOCK(tvp);
-                                       (void) VOP_CLOSE(tvp, FREAD);
-                               } else {
-                                       VOP_UNLOCK(tvp);
-                               }
-
-#ifdef UNION_DIAGNOSTIC
-                               if (!error)
-                                       uprintf("union: copied up %s\n",
-                                                               un->un_path);
-#endif
-                       }
-
-                       un->un_flags &= ~UN_ULOCK;
-                       VOP_UNLOCK(un->un_uppervp);
-                       union_vn_close(un->un_uppervp, FWRITE, cred, p);
-                       VOP_LOCK(un->un_uppervp);
-                       un->un_flags |= UN_ULOCK;
-
-                       /*
-                        * Subsequent IOs will go to the top layer, so
-                        * call close on the lower vnode and open on the
-                        * upper vnode to ensure that the filesystem keeps
-                        * its references counts right.  This doesn't do
-                        * the right thing with (cred) and (FREAD) though.
-                        * Ignoring error returns is not righ, either.
-                        */
-                       for (i = 0; i < un->un_openl; i++) {
-                               (void) VOP_CLOSE(tvp, FREAD);
-                               (void) VOP_OPEN(un->un_uppervp, FREAD, cred, p);
-                       }
-                       un->un_openl = 0;
-
+                       error = union_copyup(un, (mode&O_TRUNC) == 0, cred, p);

                        if (error == 0)
                                error = VOP_OPEN(un->un_uppervp, mode, cred, p);
                        return (error);
                        if (error == 0)
                                error = VOP_OPEN(un->un_uppervp, mode, cred, p);
                        return (error);


@@ -570,7 +524,8 @@ union_access(ap)
 }
 
 /*
 }
 
 /*

- *  We handle getattr only to change the fsid.
+ * We handle getattr only to change the fsid and
+ * track object sizes

  */
 int
 union_getattr(ap)
  */
 int
 union_getattr(ap)


@@ -615,6 +570,7 @@ union_getattr(ap)
                error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p);
                if (error)
                        return (error);
                error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p);
                if (error)
                        return (error);

+               union_newsize(ap->a_vp, vap->va_size, VNOVAL);

        }
 
        if (vp == NULLVP) {
        }
 
        if (vp == NULLVP) {


@@ -632,12 +588,13 @@ union_getattr(ap)
                VOP_UNLOCK(vp);
                if (error)
                        return (error);
                VOP_UNLOCK(vp);
                if (error)
                        return (error);

+               union_newsize(ap->a_vp, VNOVAL, vap->va_size);

        }
 
        if ((vap != ap->a_vap) && (vap->va_type == VDIR))
                ap->a_vap->va_nlink += vap->va_nlink;
 
        }
 
        if ((vap != ap->a_vap) && (vap->va_type == VDIR))
                ap->a_vap->va_nlink += vap->va_nlink;
 

-       vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];
+       ap->a_vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];

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


@@ -685,6 +642,8 @@ union_setattr(ap)
                FIXUP(un);
                error = VOP_SETATTR(un->un_uppervp, ap->a_vap,
                                        ap->a_cred, ap->a_p);
                FIXUP(un);
                error = VOP_SETATTR(un->un_uppervp, ap->a_vap,
                                        ap->a_cred, ap->a_p);

+               if ((error == 0) && (ap->a_vap->va_size != VNOVAL))
+                       union_newsize(ap->a_vp, ap->a_vap->va_size, VNOVAL);

        } else {
                error = EROFS;
        }
        } else {
                error = EROFS;
        }


@@ -713,6 +672,25 @@ union_read(ap)
        if (dolock)
                VOP_UNLOCK(vp);
 
        if (dolock)
                VOP_UNLOCK(vp);
 

+       /*
+        * XXX
+        * perhaps the size of the underlying object has changed under
+        * our feet.  take advantage of the offset information present
+        * in the uio structure.
+        */
+       if (error == 0) {
+               struct union_node *un = VTOUNION(ap->a_vp);
+               off_t cur = ap->a_uio->uio_offset;
+
+               if (vp == un->un_uppervp) {
+                       if (cur > un->un_uppersz)
+                               union_newsize(ap->a_vp, cur, VNOVAL);
+               } else {
+                       if (cur > un->un_lowersz)
+                               union_newsize(ap->a_vp, VNOVAL, cur);
+               }
+       }
+

        return (error);
 }
 
        return (error);
 }
 


@@ -737,6 +715,23 @@ union_write(ap)
        if (dolock)
                VOP_UNLOCK(vp);
 
        if (dolock)
                VOP_UNLOCK(vp);
 

+       /*
+        * the size of the underlying object may be changed by the
+        * write.
+        */
+       if (error == 0) {
+               struct union_node *un = VTOUNION(ap->a_vp);
+               off_t cur = ap->a_uio->uio_offset;
+
+               if (vp == un->un_uppervp) {
+                       if (cur > un->un_uppersz)
+                               union_newsize(ap->a_vp, cur, VNOVAL);
+               } else {
+                       if (cur > un->un_lowersz)
+                               union_newsize(ap->a_vp, VNOVAL, cur);
+               }
+       }
+

        return (error);
 }
 
        return (error);
 }
 


@@ -878,34 +873,49 @@ union_link(ap)
                struct componentname *a_cnp;
        } */ *ap;
 {
                struct componentname *a_cnp;
        } */ *ap;
 {

-       int error;
-       struct union_node *dun = VTOUNION(ap->a_vp);
-       struct union_node *un = VTOUNION(ap->a_tdvp);
+       int error = 0;
+       struct union_node *un;
+       struct vnode *vp;
+       struct vnode *tdvp;

 
 

-       if (dun->un_uppervp != NULLVP && un->un_uppervp != NULLVP) {
-               struct vnode *dvp = dun->un_uppervp;
-               struct vnode *vp = un->un_uppervp;
+       un = VTOUNION(ap->a_vp);

 
 

-               FIXUP(dun);
-               VREF(dvp);
-               dun->un_flags |= UN_KLOCK;
-               vput(ap->a_vp);
-               FIXUP(un);
-               VREF(vp);
-               vrele(ap->a_tdvp);
-
-               error = VOP_LINK(dvp, vp, ap->a_cnp);
+       if (ap->a_vp->v_op != ap->a_tdvp->v_op) {
+               tdvp = ap->a_tdvp;

        } else {
        } else {

-               /*
-                * XXX: perhaps could copy to upper layer
-                * and do the link there.
-                */
-               vput(ap->a_vp);
-               vrele(ap->a_tdvp);
+               struct union_node *tdun = VTOUNION(ap->a_tdvp);
+               if (tdun->un_uppervp == NULLVP) {
+                       VOP_LOCK(ap->a_tdvp);
+                       if (un->un_uppervp == tdun->un_dirvp) {
+                               un->un_flags &= ~UN_ULOCK;
+                               VOP_UNLOCK(un->un_uppervp);
+                       }
+                       error = union_copyup(tdun, 1, ap->a_cnp->cn_cred,
+                                               ap->a_cnp->cn_proc);
+                       if (un->un_uppervp == tdun->un_dirvp) {
+                               VOP_LOCK(un->un_uppervp);
+                               un->un_flags |= UN_ULOCK;
+                       }
+                       VOP_UNLOCK(ap->a_tdvp);
+               }
+               tdvp = tdun->un_uppervp;
+       }
+
+       vp = un->un_uppervp;
+       if (vp == NULLVP)

                error = EROFS;
                error = EROFS;

+
+       if (error) {
+               vput(ap->a_vp);
+               return (error);

        }
 
        }
 

-       return (error);
+       FIXUP(un);
+       VREF(vp);
+       un->un_flags |= UN_KLOCK;
+       vput(ap->a_vp);
+
+       return (VOP_LINK(vp, tdvp, ap->a_cnp));

 }
 
 int
 }
 
 int


@@ -1123,17 +1133,20 @@ union_readdir(ap)
                struct vnode *a_vp;
                struct uio *a_uio;
                struct ucred *a_cred;
                struct vnode *a_vp;
                struct uio *a_uio;
                struct ucred *a_cred;

+               int *a_eofflag;
+               u_long *a_cookies;
+               int a_ncookies;

        } */ *ap;
 {
        } */ *ap;
 {

-       int error = 0;
-       struct union_node *un = VTOUNION(ap->a_vp);
+       register struct union_node *un = VTOUNION(ap->a_vp);
+       register struct vnode *uvp = un->un_uppervp;

 
 

-       if (un->un_uppervp != NULLVP) {
-               FIXUP(un);
-               error = VOP_READDIR(un->un_uppervp, ap->a_uio, ap->a_cred);
-       }
+       if (uvp == NULLVP)
+               return (0);

 
 

-       return (error);
+       FIXUP(un);
+       ap->a_vp = uvp;
+       return (VOCALL(uvp->v_op, VOFFSET(vop_readdir), ap));

 }
 
 int
 }
 
 int


@@ -1247,7 +1260,8 @@ start:
        un = VTOUNION(vp);
 
        if (un->un_uppervp != NULLVP) {
        un = VTOUNION(vp);
 
        if (un->un_uppervp != NULLVP) {

-               if ((un->un_flags & UN_ULOCK) == 0) {
+               if (((un->un_flags & UN_ULOCK) == 0) &&
+                   (vp->v_usecount != 0)) {

                        un->un_flags |= UN_ULOCK;
                        VOP_LOCK(un->un_uppervp);
                }
                        un->un_flags |= UN_ULOCK;
                        VOP_LOCK(un->un_uppervp);
                }