| vfs_default.c (68186) | vfs_default.c (72200) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed 6 * to Berkeley by John Heidemann of the UCLA Ficus project. 7 * 8 * Source: * @(#)i405_init.c 2.10 92/04/27 UCLA Ficus project --- 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 * | 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed 6 * to Berkeley by John Heidemann of the UCLA Ficus project. 7 * 8 * Source: * @(#)i405_init.c 2.10 92/04/27 UCLA Ficus project --- 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 * |
| 39 * $FreeBSD: head/sys/kern/vfs_default.c 68186 2000-11-01 17:57:24Z eivind $ | 39 * $FreeBSD: head/sys/kern/vfs_default.c 72200 2001-02-09 06:11:45Z bmilekic $ |
| 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/conf.h> 47#include <sys/kernel.h> --- 396 unchanged lines hidden (view full) --- 444 vnflags |= LK_INTERLOCK; 445 return(lockmgr(&vp->v_lock, vnflags, &vp->v_interlock, ap->a_p)); 446#else /* for now */ 447 /* 448 * Since we are not using the lock manager, we must clear 449 * the interlock here. 450 */ 451 if (ap->a_flags & LK_INTERLOCK) | 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/conf.h> 47#include <sys/kernel.h> --- 396 unchanged lines hidden (view full) --- 444 vnflags |= LK_INTERLOCK; 445 return(lockmgr(&vp->v_lock, vnflags, &vp->v_interlock, ap->a_p)); 446#else /* for now */ 447 /* 448 * Since we are not using the lock manager, we must clear 449 * the interlock here. 450 */ 451 if (ap->a_flags & LK_INTERLOCK) |
| 452 mtx_exit(&ap->a_vp->v_interlock, MTX_DEF); | 452 mtx_unlock(&ap->a_vp->v_interlock); |
| 453 return (0); 454#endif 455} 456 457/* 458 * Do the inverse of vop_nolock, handling the interlock in a compatible way. 459 */ 460int --- 5 unchanged lines hidden (view full) --- 466 } */ *ap; 467{ 468 469 /* 470 * Since we are not using the lock manager, we must clear 471 * the interlock here. 472 */ 473 if (ap->a_flags & LK_INTERLOCK) | 453 return (0); 454#endif 455} 456 457/* 458 * Do the inverse of vop_nolock, handling the interlock in a compatible way. 459 */ 460int --- 5 unchanged lines hidden (view full) --- 466 } */ *ap; 467{ 468 469 /* 470 * Since we are not using the lock manager, we must clear 471 * the interlock here. 472 */ 473 if (ap->a_flags & LK_INTERLOCK) |
| 474 mtx_exit(&ap->a_vp->v_interlock, MTX_DEF); | 474 mtx_unlock(&ap->a_vp->v_interlock); |
| 475 return (0); 476} 477 478/* 479 * Return whether or not the node is in use. 480 */ 481int 482vop_noislocked(ap) --- 257 unchanged lines hidden --- | 475 return (0); 476} 477 478/* 479 * Return whether or not the node is in use. 480 */ 481int 482vop_noislocked(ap) --- 257 unchanged lines hidden --- |