| vfs_subr.c (169667) | vfs_subr.c (169671) |
|---|---|
| 1/*- 2 * Copyright (c) 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. --- 25 unchanged lines hidden (view full) --- 34 * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 35 */ 36 37/* 38 * External virtual filesystem routines 39 */ 40 41#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 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. --- 25 unchanged lines hidden (view full) --- 34 * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 35 */ 36 37/* 38 * External virtual filesystem routines 39 */ 40 41#include <sys/cdefs.h> |
| 42__FBSDID("$FreeBSD: head/sys/kern/vfs_subr.c 169667 2007-05-18 07:10:50Z jeff $"); | 42__FBSDID("$FreeBSD: head/sys/kern/vfs_subr.c 169671 2007-05-18 13:02:13Z kib $"); |
| 43 44#include "opt_ddb.h" 45#include "opt_mac.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> 49#include <sys/bio.h> 50#include <sys/buf.h> --- 2992 unchanged lines hidden (view full) --- 3043static int sync_reclaim(struct vop_reclaim_args *); 3044 3045static struct vop_vector sync_vnodeops = { 3046 .vop_bypass = VOP_EOPNOTSUPP, 3047 .vop_close = sync_close, /* close */ 3048 .vop_fsync = sync_fsync, /* fsync */ 3049 .vop_inactive = sync_inactive, /* inactive */ 3050 .vop_reclaim = sync_reclaim, /* reclaim */ | 43 44#include "opt_ddb.h" 45#include "opt_mac.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> 49#include <sys/bio.h> 50#include <sys/buf.h> --- 2992 unchanged lines hidden (view full) --- 3043static int sync_reclaim(struct vop_reclaim_args *); 3044 3045static struct vop_vector sync_vnodeops = { 3046 .vop_bypass = VOP_EOPNOTSUPP, 3047 .vop_close = sync_close, /* close */ 3048 .vop_fsync = sync_fsync, /* fsync */ 3049 .vop_inactive = sync_inactive, /* inactive */ 3050 .vop_reclaim = sync_reclaim, /* reclaim */ |
| 3051 ._vop_lock = vop_stdlock, /* lock */ | 3051 .vop_lock1 = vop_stdlock, /* lock */ |
| 3052 .vop_unlock = vop_stdunlock, /* unlock */ 3053 .vop_islocked = vop_stdislocked, /* islocked */ 3054}; 3055 3056/* 3057 * Create a new filesystem syncer vnode for the specified mount point. 3058 */ 3059int --- 490 unchanged lines hidden (view full) --- 3550 ASSERT_VOP_LOCKED(vp, "VOP_LOOKUP (child)"); 3551#endif 3552} 3553 3554void 3555vop_lock_pre(void *ap) 3556{ 3557#ifdef DEBUG_VFS_LOCKS | 3052 .vop_unlock = vop_stdunlock, /* unlock */ 3053 .vop_islocked = vop_stdislocked, /* islocked */ 3054}; 3055 3056/* 3057 * Create a new filesystem syncer vnode for the specified mount point. 3058 */ 3059int --- 490 unchanged lines hidden (view full) --- 3550 ASSERT_VOP_LOCKED(vp, "VOP_LOOKUP (child)"); 3551#endif 3552} 3553 3554void 3555vop_lock_pre(void *ap) 3556{ 3557#ifdef DEBUG_VFS_LOCKS |
| 3558 struct _vop_lock_args *a = ap; | 3558 struct vop_lock1_args *a = ap; |
| 3559 3560 if ((a->a_flags & LK_INTERLOCK) == 0) 3561 ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK"); 3562 else 3563 ASSERT_VI_LOCKED(a->a_vp, "VOP_LOCK"); 3564#endif 3565} 3566 3567void 3568vop_lock_post(void *ap, int rc) 3569{ 3570#ifdef DEBUG_VFS_LOCKS | 3559 3560 if ((a->a_flags & LK_INTERLOCK) == 0) 3561 ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK"); 3562 else 3563 ASSERT_VI_LOCKED(a->a_vp, "VOP_LOCK"); 3564#endif 3565} 3566 3567void 3568vop_lock_post(void *ap, int rc) 3569{ 3570#ifdef DEBUG_VFS_LOCKS |
| 3571 struct _vop_lock_args *a = ap; | 3571 struct vop_lock1_args *a = ap; |
| 3572 3573 ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK"); 3574 if (rc == 0) 3575 ASSERT_VOP_LOCKED(a->a_vp, "VOP_LOCK"); 3576#endif 3577} 3578 3579void --- 388 unchanged lines hidden --- | 3572 3573 ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK"); 3574 if (rc == 0) 3575 ASSERT_VOP_LOCKED(a->a_vp, "VOP_LOCK"); 3576#endif 3577} 3578 3579void --- 388 unchanged lines hidden --- |