union_vnops.c (923502ff91327138aa9ef1d59ea7044d2936e0ef) union_vnops.c (edfe736df916f9ca24d812ba13c52aed1fe8b4da)
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 *

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

700{
701 struct union_node *dun = VTOUNION(ap->a_dvp);
702 struct componentname *cnp = ap->a_cnp;
703 struct vnode *dvp;
704 int error = EROFS;
705
706 if ((dvp = union_lock_upper(dun, cnp->cn_proc)) != NULL) {
707 struct vnode *vp;
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 *

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

700{
701 struct union_node *dun = VTOUNION(ap->a_dvp);
702 struct componentname *cnp = ap->a_cnp;
703 struct vnode *dvp;
704 int error = EROFS;
705
706 if ((dvp = union_lock_upper(dun, cnp->cn_proc)) != NULL) {
707 struct vnode *vp;
708 error = VOP_MKNOD(dvp, &vp, cnp, ap->a_vap);
709 /* vp is garbage whether an error occurs or not */
708 error = VOP_MKNOD(dvp, ap->a_vpp, cnp, ap->a_vap);
710 union_unlock_upper(dvp, cnp->cn_proc);
711 }
712 return (error);
713}
714
715/*
716 * union_open:
717 *

--- 1310 unchanged lines hidden --- 		709 union_unlock_upper(dvp, cnp->cn_proc);
710 }
711 return (error);
712}
713
714/*
715 * union_open:
716 *

--- 1310 unchanged lines hidden ---