| cd9660_lookup.c (144208) | cd9660_lookup.c (145006) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 22 unchanged lines hidden (view full) --- 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 35 * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 36 */ 37 38#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 22 unchanged lines hidden (view full) --- 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 35 * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 36 */ 37 38#include <sys/cdefs.h> |
| 39__FBSDID("$FreeBSD: head/sys/fs/cd9660/cd9660_lookup.c 144208 2005-03-28 09:34:36Z jeff $"); | 39__FBSDID("$FreeBSD: head/sys/fs/cd9660/cd9660_lookup.c 145006 2005-04-13 10:59:09Z jeff $"); |
| 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/namei.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/vnode.h> 47#include <sys/mount.h> --- 300 unchanged lines hidden (view full) --- 348 * it's a relocated directory. 349 */ 350 if (flags & ISDOTDOT) { 351 VOP_UNLOCK(pdp, 0, td); /* race to get the inode */ 352 error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, 353 LK_EXCLUSIVE, &tdp, 354 dp->i_ino != ino, ep); 355 brelse(bp); | 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/namei.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/vnode.h> 47#include <sys/mount.h> --- 300 unchanged lines hidden (view full) --- 348 * it's a relocated directory. 349 */ 350 if (flags & ISDOTDOT) { 351 VOP_UNLOCK(pdp, 0, td); /* race to get the inode */ 352 error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, 353 LK_EXCLUSIVE, &tdp, 354 dp->i_ino != ino, ep); 355 brelse(bp); |
| 356 if (error) { 357 vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td); | 356 vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td); 357 if (error) |
| 358 return (error); | 358 return (error); |
| 359 } | |
| 360 *vpp = tdp; 361 } else if (dp->i_number == dp->i_ino) { 362 brelse(bp); 363 VREF(vdp); /* we want ourself, ie "." */ 364 *vpp = vdp; 365 } else { 366 error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, 367 LK_EXCLUSIVE, &tdp, --- 63 unchanged lines hidden --- | 359 *vpp = tdp; 360 } else if (dp->i_number == dp->i_ino) { 361 brelse(bp); 362 VREF(vdp); /* we want ourself, ie "." */ 363 *vpp = vdp; 364 } else { 365 error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, 366 LK_EXCLUSIVE, &tdp, --- 63 unchanged lines hidden --- |