| union_vnops.c (589421d418c4b81cf58d9c38d9d2b78100a7d748) | union_vnops.c (b2bde4cb07542a61c25e889f08dce0e6855b122b) |
|---|---|
| 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.54 1998/02/10 03:32:07 kato Exp $ | 38 * $Id: union_vnops.c,v 1.55 1998/02/26 03:23:56 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/stat.h> 46#include <sys/kernel.h> --- 721 unchanged lines hidden (view full) --- 768 error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p); 769 if (error) 770 return (error); 771 union_newsize(ap->a_vp, vap->va_size, VNOVAL); 772 } 773 774 if (vp == NULLVP) { 775 vp = un->un_lowervp; | 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/stat.h> 46#include <sys/kernel.h> --- 721 unchanged lines hidden (view full) --- 768 error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p); 769 if (error) 770 return (error); 771 union_newsize(ap->a_vp, vap->va_size, VNOVAL); 772 } 773 774 if (vp == NULLVP) { 775 vp = un->un_lowervp; |
| 776 } else if (vp->v_type == VDIR) { | 776 } else if (vp->v_type == VDIR && un->un_lowervp != NULLVP) { |
| 777 vp = un->un_lowervp; 778 vap = &va; 779 } else { 780 vp = NULLVP; 781 } 782 783 if (vp != NULLVP) { 784 error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p); --- 1014 unchanged lines hidden --- | 777 vp = un->un_lowervp; 778 vap = &va; 779 } else { 780 vp = NULLVP; 781 } 782 783 if (vp != NULLVP) { 784 error = VOP_GETATTR(vp, vap, ap->a_cred, ap->a_p); --- 1014 unchanged lines hidden --- |