Deleted Added
full compact
ibcs2_util.c (83366) ibcs2_util.c (91406)
1/*
2 * Copyright (c) 1994 Christos Zoulas
3 * Copyright (c) 1995 Frank van der Linden
4 * Copyright (c) 1995 Scott Bartram
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
1/*
2 * Copyright (c) 1994 Christos Zoulas
3 * Copyright (c) 1995 Frank van der Linden
4 * Copyright (c) 1995 Scott Bartram
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
30 * $FreeBSD: head/sys/i386/ibcs2/ibcs2_util.c 83366 2001-09-12 08:38:13Z julian $
30 * $FreeBSD: head/sys/i386/ibcs2/ibcs2_util.c 91406 2002-02-27 18:32:23Z jhb $
31 */
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/namei.h>
36#include <sys/malloc.h>
37#include <sys/vnode.h>
38

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

135 if ((error = namei(&ndroot)) != 0) {
136 /* Cannot happen! */
137 free(buf, M_TEMP);
138 NDFREE(&nd, NDF_ONLY_PNBUF);
139 vrele(nd.ni_vp);
140 return error;
141 }
142
31 */
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/namei.h>
36#include <sys/malloc.h>
37#include <sys/vnode.h>
38

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

135 if ((error = namei(&ndroot)) != 0) {
136 /* Cannot happen! */
137 free(buf, M_TEMP);
138 NDFREE(&nd, NDF_ONLY_PNBUF);
139 vrele(nd.ni_vp);
140 return error;
141 }
142
143 if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_proc->p_ucred, td)) != 0) {
143 if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_ucred, td)) != 0) {
144 goto done;
145 }
146
144 goto done;
145 }
146
147 if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_proc->p_ucred, td))
147 if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_ucred, td))
148 != 0) {
149 goto done;
150 }
151
152 if (vat.va_fsid == vatroot.va_fsid &&
153 vat.va_fileid == vatroot.va_fileid) {
154 error = ENOENT;
155 goto done;

--- 22 unchanged lines hidden ---
148 != 0) {
149 goto done;
150 }
151
152 if (vat.va_fsid == vatroot.va_fsid &&
153 vat.va_fileid == vatroot.va_fileid) {
154 error = ENOENT;
155 goto done;

--- 22 unchanged lines hidden ---