| vfs_subr.c (234607) | vfs_subr.c (236317) |
|---|---|
| 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 234607 2012-04-23 14:10:34Z trasz $"); | 42__FBSDID("$FreeBSD: head/sys/kern/vfs_subr.c 236317 2012-05-30 16:06:38Z kib $"); |
| 43 44#include "opt_ddb.h" 45#include "opt_watchdog.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> 49#include <sys/bio.h> 50#include <sys/buf.h> --- 971 unchanged lines hidden (view full) --- 1022 else if (mp == NULL && vops != &dead_vnodeops) 1023 printf("NULL mp in getnewvnode()\n"); 1024#endif 1025 if (mp != NULL) { 1026 bo->bo_bsize = mp->mnt_stat.f_iosize; 1027 if ((mp->mnt_kern_flag & MNTK_NOKNOTE) != 0) 1028 vp->v_vflag |= VV_NOKNOTE; 1029 } | 43 44#include "opt_ddb.h" 45#include "opt_watchdog.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> 49#include <sys/bio.h> 50#include <sys/buf.h> --- 971 unchanged lines hidden (view full) --- 1022 else if (mp == NULL && vops != &dead_vnodeops) 1023 printf("NULL mp in getnewvnode()\n"); 1024#endif 1025 if (mp != NULL) { 1026 bo->bo_bsize = mp->mnt_stat.f_iosize; 1027 if ((mp->mnt_kern_flag & MNTK_NOKNOTE) != 0) 1028 vp->v_vflag |= VV_NOKNOTE; 1029 } |
| 1030 rangelock_init(&vp->v_rl); |
|
| 1030 1031 *vpp = vp; 1032 return (0); 1033} 1034 1035/* 1036 * Delete from old mount point vnode list, if on one. 1037 */ --- 1425 unchanged lines hidden (view full) --- 2463 mac_vnode_destroy(vp); 2464#endif 2465 if (vp->v_pollinfo != NULL) 2466 destroy_vpollinfo(vp->v_pollinfo); 2467#ifdef INVARIANTS 2468 /* XXX Elsewhere we detect an already freed vnode via NULL v_op. */ 2469 vp->v_op = NULL; 2470#endif | 1031 1032 *vpp = vp; 1033 return (0); 1034} 1035 1036/* 1037 * Delete from old mount point vnode list, if on one. 1038 */ --- 1425 unchanged lines hidden (view full) --- 2464 mac_vnode_destroy(vp); 2465#endif 2466 if (vp->v_pollinfo != NULL) 2467 destroy_vpollinfo(vp->v_pollinfo); 2468#ifdef INVARIANTS 2469 /* XXX Elsewhere we detect an already freed vnode via NULL v_op. */ 2470 vp->v_op = NULL; 2471#endif |
| 2472 rangelock_destroy(&vp->v_rl); |
|
| 2471 lockdestroy(vp->v_vnlock); 2472 mtx_destroy(&vp->v_interlock); 2473 mtx_destroy(BO_MTX(bo)); 2474 uma_zfree(vnode_zone, vp); 2475} 2476 2477/* 2478 * Call VOP_INACTIVE on the vnode and manage the DOINGINACT and OWEINACT --- 2256 unchanged lines hidden --- | 2473 lockdestroy(vp->v_vnlock); 2474 mtx_destroy(&vp->v_interlock); 2475 mtx_destroy(BO_MTX(bo)); 2476 uma_zfree(vnode_zone, vp); 2477} 2478 2479/* 2480 * Call VOP_INACTIVE on the vnode and manage the DOINGINACT and OWEINACT --- 2256 unchanged lines hidden --- |