X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/463c036020700bb67f65444d76e23497c9c4ced6..8de82e021750df3ffd3a3652b071aac42f9c1576:/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 22cbdf50f7..14d124b711 100644
--- 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%
  *
- *	@(#)union_vnops.c	8.8 (Berkeley) %G%
+ *	@(#)union_vnops.c	8.16 (Berkeley) %G%
  */
 
 #include <sys/param.h>
@@ -151,7 +151,7 @@ union_lookup(ap)
 	 * then assume that something special is going
 	 * on and just return that vnode.
 	 */
-	if (upperdvp) {
+	if (upperdvp != NULLVP) {
 		FIXUP(dun);
 		uerror = union_lookup1(um->um_uppervp, &upperdvp,
 					&uppervp, cnp);
@@ -175,7 +175,7 @@ union_lookup(ap)
 	 * back from the upper layer and return the lower vnode
 	 * instead.
 	 */
-	if (lowerdvp) {
+	if (lowerdvp != NULLVP) {
 		int nameiop;
 
 		VOP_LOCK(lowerdvp);
@@ -200,7 +200,7 @@ union_lookup(ap)
 			VOP_UNLOCK(lowerdvp);
 
 		if (cnp->cn_consume != 0) {
-			if (uppervp) {
+			if (uppervp != NULLVP) {
 				if (uppervp == upperdvp)
 					vrele(uppervp);
 				else
@@ -260,7 +260,7 @@ union_lookup(ap)
 			dun->un_flags |= UN_ULOCK;
 
 			if (uerror) {
-				if (lowervp) {
+				if (lowervp != NULLVP) {
 					vput(lowervp);
 					lowervp = NULLVP;
 				}
@@ -269,16 +269,16 @@ union_lookup(ap)
 		}
 	}
 
-	if (lowervp)
+	if (lowervp != NULLVP)
 		VOP_UNLOCK(lowervp);
 
 	error = union_allocvp(ap->a_vpp, dvp->v_mount, dvp, upperdvp, cnp,
 			      uppervp, lowervp);
 
 	if (error) {
-		if (uppervp)
+		if (uppervp != NULLVP)
 			vput(uppervp);
-		if (lowervp)
+		if (lowervp != NULLVP)
 			vrele(lowervp);
 	} else {
 		if (*ap->a_vpp != dvp)
@@ -301,7 +301,7 @@ union_create(ap)
 	struct union_node *un = VTOUNION(ap->a_dvp);
 	struct vnode *dvp = un->un_uppervp;
 
-	if (dvp) {
+	if (dvp != NULLVP) {
 		int error;
 		struct vnode *vp;
 
@@ -343,7 +343,7 @@ union_mknod(ap)
 	struct union_node *un = VTOUNION(ap->a_dvp);
 	struct vnode *dvp = un->un_uppervp;
 
-	if (dvp) {
+	if (dvp != NULLVP) {
 		int error;
 		struct vnode *vp;
 
@@ -356,7 +356,7 @@ union_mknod(ap)
 		if (error)
 			return (error);
 
-		if (vp) {
+		if (vp != NULLVP) {
 			error = union_allocvp(
 					ap->a_vpp,
 					ap->a_dvp->v_mount,
@@ -404,77 +404,7 @@ union_open(ap)
 		 */
 		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);
@@ -510,7 +440,7 @@ union_close(ap)
 	struct union_node *un = VTOUNION(ap->a_vp);
 	struct vnode *vp;
 
-	if (un->un_uppervp) {
+	if (un->un_uppervp != NULLVP) {
 		vp = un->un_uppervp;
 	} else {
 #ifdef UNION_DIAGNOSTIC
@@ -546,12 +476,12 @@ union_access(ap)
 	int error = EACCES;
 	struct vnode *vp;
 
-	if (vp = un->un_uppervp) {
+	if ((vp = un->un_uppervp) != NULLVP) {
 		FIXUP(un);
 		return (VOP_ACCESS(vp, ap->a_mode, ap->a_cred, ap->a_p));
 	}
 
-	if (vp = un->un_lowervp) {
+	if ((vp = un->un_lowervp) != NULLVP) {
 		VOP_LOCK(vp);
 		error = VOP_ACCESS(vp, ap->a_mode, ap->a_cred, ap->a_p);
 		if (error == 0) {
@@ -570,7 +500,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)
@@ -615,6 +546,7 @@ union_getattr(ap)
 		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) {
@@ -632,12 +564,13 @@ union_getattr(ap)
 		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;
 
-	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);
 }
 
@@ -685,6 +618,8 @@ union_setattr(ap)
 		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;
 	}
@@ -713,6 +648,25 @@ union_read(ap)
 	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);
 }
 
@@ -737,6 +691,23 @@ union_write(ap)
 	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);
 }
 
@@ -797,7 +768,7 @@ union_fsync(ap)
 	int error = 0;
 	struct vnode *targetvp = OTHERVP(ap->a_vp);
 
-	if (targetvp) {
+	if (targetvp != NULLVP) {
 		int dolock = (targetvp == LOWERVP(ap->a_vp));
 
 		if (dolock)
@@ -838,7 +809,7 @@ union_remove(ap)
 	struct union_node *dun = VTOUNION(ap->a_dvp);
 	struct union_node *un = VTOUNION(ap->a_vp);
 
-	if (dun->un_uppervp && un->un_uppervp) {
+	if (dun->un_uppervp != NULLVP && un->un_uppervp != NULLVP) {
 		struct vnode *dvp = dun->un_uppervp;
 		struct vnode *vp = un->un_uppervp;
 
@@ -878,34 +849,49 @@ union_link(ap)
 		struct componentname *a_cnp;
 	} */ *ap;
 {
-	int error;
-	struct union_node *dun = VTOUNION(ap->a_vp);
-	struct union_node *un = VTOUNION(ap->a_tdvp);
-
-	if (dun->un_uppervp && un->un_uppervp) {
-		struct vnode *dvp = dun->un_uppervp;
-		struct vnode *vp = un->un_uppervp;
+	int error = 0;
+	struct union_node *un;
+	struct vnode *vp;
+	struct vnode *tdvp;
 
-		FIXUP(dun);
-		VREF(dvp);
-		dun->un_flags |= UN_KLOCK;
-		vput(ap->a_vp);
-		FIXUP(un);
-		VREF(vp);
-		vrele(ap->a_tdvp);
+	un = VTOUNION(ap->a_vp);
 
-		error = VOP_LINK(dvp, vp, ap->a_cnp);
+	if (ap->a_vp->v_op != ap->a_tdvp->v_op) {
+		tdvp = ap->a_tdvp;
 	} else {
-		/*
-		 * XXX: need to 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;
+
+	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
@@ -933,7 +919,6 @@ union_rename(ap)
 			goto bad;
 		}
 
-		FIXUP(un);
 		fdvp = un->un_uppervp;
 		VREF(fdvp);
 		vrele(ap->a_fdvp);
@@ -946,7 +931,6 @@ union_rename(ap)
 			goto bad;
 		}
 
-		FIXUP(un);
 		fvp = un->un_uppervp;
 		VREF(fvp);
 		vrele(ap->a_fvp);
@@ -955,6 +939,12 @@ union_rename(ap)
 	if (tdvp->v_op == union_vnodeop_p) {
 		struct union_node *un = VTOUNION(tdvp);
 		if (un->un_uppervp == NULLVP) {
+			/*
+			 * this should never happen in normal
+			 * operation but might if there was
+			 * a problem creating the top-level shadow
+			 * directory.
+			 */
 			error = EROFS;
 			goto bad;
 		}
@@ -965,16 +955,14 @@ union_rename(ap)
 		vput(ap->a_tdvp);
 	}
 
-	if (tvp && tvp->v_op == union_vnodeop_p) {
+	if (tvp != NULLVP && tvp->v_op == union_vnodeop_p) {
 		struct union_node *un = VTOUNION(tvp);
-		if (un->un_uppervp == NULLVP) {
-			error = EROFS;
-			goto bad;
-		}
 
 		tvp = un->un_uppervp;
-		VREF(tvp);
-		un->un_flags |= UN_KLOCK;
+		if (tvp != NULLVP) {
+			VREF(tvp);
+			un->un_flags |= UN_KLOCK;
+		}
 		vput(ap->a_tvp);
 	}
 
@@ -984,7 +972,7 @@ bad:
 	vrele(fdvp);
 	vrele(fvp);
 	vput(tdvp);
-	if (tvp)
+	if (tvp != NULLVP)
 		vput(tvp);
 
 	return (error);
@@ -1002,7 +990,7 @@ union_mkdir(ap)
 	struct union_node *un = VTOUNION(ap->a_dvp);
 	struct vnode *dvp = un->un_uppervp;
 
-	if (dvp) {
+	if (dvp != NULLVP) {
 		int error;
 		struct vnode *vp;
 
@@ -1043,7 +1031,7 @@ union_rmdir(ap)
 	struct union_node *dun = VTOUNION(ap->a_dvp);
 	struct union_node *un = VTOUNION(ap->a_vp);
 
-	if (dun->un_uppervp && un->un_uppervp) {
+	if (dun->un_uppervp != NULLVP && un->un_uppervp != NULLVP) {
 		struct vnode *dvp = dun->un_uppervp;
 		struct vnode *vp = un->un_uppervp;
 
@@ -1088,7 +1076,7 @@ union_symlink(ap)
 	struct union_node *un = VTOUNION(ap->a_dvp);
 	struct vnode *dvp = un->un_uppervp;
 
-	if (dvp) {
+	if (dvp != NULLVP) {
 		int error;
 		struct vnode *vp;
 		struct mount *mp = ap->a_dvp->v_mount;
@@ -1121,17 +1109,20 @@ union_readdir(ap)
 		struct vnode *a_vp;
 		struct uio *a_uio;
 		struct ucred *a_cred;
+		int *a_eofflag;
+		u_long *a_cookies;
+		int a_ncookies;
 	} */ *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) {
-		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
@@ -1244,8 +1235,9 @@ start:
 
 	un = VTOUNION(vp);
 
-	if (un->un_uppervp) {
-		if ((un->un_flags & UN_ULOCK) == 0) {
+	if (un->un_uppervp != NULLVP) {
+		if (((un->un_flags & UN_ULOCK) == 0) &&
+		    (vp->v_usecount != 0)) {
 			un->un_flags |= UN_ULOCK;
 			VOP_LOCK(un->un_uppervp);
 		}