| vfs_lookup.c (42453) | vfs_lookup.c (43301) |
|---|---|
| 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 | 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 |
| 39 * $Id: vfs_lookup.c,v 1.30 1999/01/08 17:31:16 eivind Exp $ | 39 * $Id: vfs_lookup.c,v 1.31 1999/01/10 01:58:26 eivind Exp $ |
| 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/namei.h> 47#include <sys/vnode.h> --- 361 unchanged lines hidden (view full) --- 409 410 /* 411 * We now have a segment name to search for, and a directory to search. 412 */ 413unionlookup: 414 ndp->ni_dvp = dp; 415 ndp->ni_vp = NULL; 416 ASSERT_VOP_LOCKED(dp, "lookup"); | 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/namei.h> 47#include <sys/vnode.h> --- 361 unchanged lines hidden (view full) --- 409 410 /* 411 * We now have a segment name to search for, and a directory to search. 412 */ 413unionlookup: 414 ndp->ni_dvp = dp; 415 ndp->ni_vp = NULL; 416 ASSERT_VOP_LOCKED(dp, "lookup"); |
| 417 if (error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp)) { | 417 if ((error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp)) != 0) { |
| 418 KASSERT(ndp->ni_vp == NULL, ("leaf should be empty")); 419#ifdef NAMEI_DIAGNOSTIC 420 printf("not found\n"); 421#endif 422 if ((error == ENOENT) && 423 (dp->v_flag & VROOT) && 424 (dp->v_mount->mnt_flag & MNT_UNION)) { 425 tdp = dp; --- 281 unchanged lines hidden --- | 418 KASSERT(ndp->ni_vp == NULL, ("leaf should be empty")); 419#ifdef NAMEI_DIAGNOSTIC 420 printf("not found\n"); 421#endif 422 if ((error == ENOENT) && 423 (dp->v_flag & VROOT) && 424 (dp->v_mount->mnt_flag & MNT_UNION)) { 425 tdp = dp; --- 281 unchanged lines hidden --- |