union_vnops.c (9095719e2b05d6e1673b755809128a6ad3ea1388) union_vnops.c (93d71a483ca7918e17405cf5f6c163470682c087)
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995 Jan-Simon Pendry.
3 * Copyright (c) 1992, 1993, 1994, 1995
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995 Jan-Simon Pendry.
3 * Copyright (c) 1992, 1993, 1994, 1995
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
38 * $Id: union_vnops.c,v 1.23 1997/04/14 05:13:55 kato Exp $
38 * $Id: union_vnops.c,v 1.24 1997/04/15 12:56:57 kato Exp $
39 */
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/proc.h>
44#include <sys/fcntl.h>
45#include <sys/time.h>
46#include <sys/stat.h>

--- 1006 unchanged lines hidden (view full) ---

1053 } */ *ap;
1054{
1055 int error = 0;
1056 struct componentname *cnp = ap->a_cnp;
1057 struct proc *p = cnp->cn_proc;
1058 struct union_node *un;
1059 struct vnode *vp;
1060 struct vnode *tdvp;
39 */
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/proc.h>
44#include <sys/fcntl.h>
45#include <sys/time.h>
46#include <sys/stat.h>

--- 1006 unchanged lines hidden (view full) ---

1053 } */ *ap;
1054{
1055 int error = 0;
1056 struct componentname *cnp = ap->a_cnp;
1057 struct proc *p = cnp->cn_proc;
1058 struct union_node *un;
1059 struct vnode *vp;
1060 struct vnode *tdvp;
1061 int isvnunlocked = 0;
1062
1063 un = VTOUNION(ap->a_tdvp);
1064
1065 if (ap->a_tdvp->v_op != ap->a_vp->v_op) {
1066 vp = ap->a_vp;
1067 } else {
1068 struct union_node *tun = VTOUNION(ap->a_vp);
1069 if (tun->un_uppervp == NULLVP) {

--- 22 unchanged lines hidden (view full) ---

1092 return (error);
1093 }
1094
1095 FIXUP(un, p);
1096 VREF(tdvp);
1097 un->un_flags |= UN_KLOCK;
1098 vput(ap->a_tdvp);
1099
1061
1062 un = VTOUNION(ap->a_tdvp);
1063
1064 if (ap->a_tdvp->v_op != ap->a_vp->v_op) {
1065 vp = ap->a_vp;
1066 } else {
1067 struct union_node *tun = VTOUNION(ap->a_vp);
1068 if (tun->un_uppervp == NULLVP) {

--- 22 unchanged lines hidden (view full) ---

1091 return (error);
1092 }
1093
1094 FIXUP(un, p);
1095 VREF(tdvp);
1096 un->un_flags |= UN_KLOCK;
1097 vput(ap->a_tdvp);
1098
1100 /*
1101 * XXX -- This is a quick-hack to avoid panic. Problem still remains!
1102 * The process which access the union filesystem will be hang-up after
1103 * making link in the union fs.
1104 */
1105 if (VOP_ISLOCKED(tdvp) && (tdvp->v_op != union_vnodeop_p)) {
1106 isvnunlocked = 1;
1107 VOP_UNLOCK(tdvp, 0, p);
1108 }
1109 error = VOP_LINK(vp, tdvp, cnp);
1110 if (isvnunlocked)
1111 vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY, p);
1112 return error;
1099 return (VOP_LINK(tdvp, vp, cnp));
1113}
1114
1115int
1116union_rename(ap)
1117 struct vop_rename_args /* {
1118 struct vnode *a_fdvp;
1119 struct vnode *a_fvp;
1120 struct componentname *a_fcnp;

--- 644 unchanged lines hidden --- 		1100}
1101
1102int
1103union_rename(ap)
1104 struct vop_rename_args /* {
1105 struct vnode *a_fdvp;
1106 struct vnode *a_fvp;
1107 struct componentname *a_fcnp;

--- 644 unchanged lines hidden ---