| nfs_node.c (99797) | nfs_node.c (103314) |
|---|---|
| 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 to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 23 unchanged lines hidden (view full) --- 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_node.c 8.6 (Berkeley) 5/22/95 37 */ 38 39#include <sys/cdefs.h> | 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 to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 23 unchanged lines hidden (view full) --- 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_node.c 8.6 (Berkeley) 5/22/95 37 */ 38 39#include <sys/cdefs.h> |
| 40__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_node.c 99797 2002-07-11 17:54:58Z dillon $"); | 40__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_node.c 103314 2002-09-14 09:02:28Z njl $"); |
| 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/fnv_hash.h> 45#include <sys/lock.h> 46#include <sys/malloc.h> 47#include <sys/mount.h> 48#include <sys/namei.h> --- 169 unchanged lines hidden (view full) --- 218 219 /* 220 * Allocate before getnewvnode since doing so afterward 221 * might cause a bogus v_data pointer to get dereferenced 222 * elsewhere if zalloc should block. 223 */ 224 np = uma_zalloc(nfsnode_zone, M_WAITOK); 225 | 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/fnv_hash.h> 45#include <sys/lock.h> 46#include <sys/malloc.h> 47#include <sys/mount.h> 48#include <sys/namei.h> --- 169 unchanged lines hidden (view full) --- 218 219 /* 220 * Allocate before getnewvnode since doing so afterward 221 * might cause a bogus v_data pointer to get dereferenced 222 * elsewhere if zalloc should block. 223 */ 224 np = uma_zalloc(nfsnode_zone, M_WAITOK); 225 |
| 226 error = getnewvnode(VT_NFS, mntp, nfsv2_vnodeop_p, &nvp); | 226 error = getnewvnode("nfs", mntp, nfsv2_vnodeop_p, &nvp); |
| 227 if (error) { 228 if (nfs_node_hash_lock < 0) 229 wakeup(&nfs_node_hash_lock); 230 nfs_node_hash_lock = 0; 231 *npp = 0; 232 uma_zfree(nfsnode_zone, np); 233 return (error); 234 } --- 125 unchanged lines hidden --- | 227 if (error) { 228 if (nfs_node_hash_lock < 0) 229 wakeup(&nfs_node_hash_lock); 230 nfs_node_hash_lock = 0; 231 *npp = 0; 232 uma_zfree(nfsnode_zone, np); 233 return (error); 234 } --- 125 unchanged lines hidden --- |