| union_vfsops.c (175294) | union_vfsops.c (176559) |
|---|---|
| 1/*- 2 * Copyright (c) 1994, 1995 The Regents of the University of California. 3 * Copyright (c) 1994, 1995 Jan-Simon Pendry. 4 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 19 unchanged lines hidden (view full) --- 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 | 1/*- 2 * Copyright (c) 1994, 1995 The Regents of the University of California. 3 * Copyright (c) 1994, 1995 Jan-Simon Pendry. 4 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 19 unchanged lines hidden (view full) --- 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 |
| 36 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 175294 2008-01-13 14:44:15Z attilio $ | 36 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 176559 2008-02-25 18:45:57Z attilio $ |
| 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/kdb.h> 42#include <sys/kernel.h> 43#include <sys/lock.h> 44#include <sys/malloc.h> --- 375 unchanged lines hidden (view full) --- 420{ 421 struct unionfs_mount *ump; 422 struct vnode *vp; 423 424 ump = MOUNTTOUNIONFSMOUNT(mp); 425 vp = ump->um_rootvp; 426 427 UNIONFSDEBUG("unionfs_root: rootvp=%p locked=%x\n", | 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/kdb.h> 42#include <sys/kernel.h> 43#include <sys/lock.h> 44#include <sys/malloc.h> --- 375 unchanged lines hidden (view full) --- 420{ 421 struct unionfs_mount *ump; 422 struct vnode *vp; 423 424 ump = MOUNTTOUNIONFSMOUNT(mp); 425 vp = ump->um_rootvp; 426 427 UNIONFSDEBUG("unionfs_root: rootvp=%p locked=%x\n", |
| 428 vp, VOP_ISLOCKED(vp, td)); | 428 vp, VOP_ISLOCKED(vp)); |
| 429 430 vref(vp); 431 if (flags & LK_TYPE_MASK) 432 vn_lock(vp, flags); 433 434 *vpp = vp; 435 436 return (0); --- 126 unchanged lines hidden --- | 429 430 vref(vp); 431 if (flags & LK_TYPE_MASK) 432 vn_lock(vp, flags); 433 434 *vpp = vp; 435 436 return (0); --- 126 unchanged lines hidden --- |