Deleted Added
full compact
nfs_commonport.c (205572) nfs_commonport.c (205941)
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

--- 18 unchanged lines hidden (view full) ---

27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 */
33
34#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

--- 18 unchanged lines hidden (view full) ---

27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: head/sys/fs/nfs/nfs_commonport.c 205572 2010-03-24 02:02:02Z rmacklem $");
35__FBSDID("$FreeBSD: head/sys/fs/nfs/nfs_commonport.c 205941 2010-03-30 23:11:50Z rmacklem $");
36
37/*
38 * Functions that need to be different for different versions of BSD
39 * kernel should be kept here, along with any global storage specific
40 * to this BSD variant.
41 */
42#include <fs/nfs/nfsport.h>
43#include <sys/sysctl.h>

--- 33 unchanged lines hidden (view full) ---

77 nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), "");
78
79/*
80 * Defines for malloc
81 * (Here for FreeBSD, since they allocate storage.)
82 */
83MALLOC_DEFINE(M_NEWNFSRVCACHE, "NFSD srvcache", "NFSD Server Request Cache");
84MALLOC_DEFINE(M_NEWNFSDCLIENT, "NFSD V4client", "NFSD V4 Client Id");
36
37/*
38 * Functions that need to be different for different versions of BSD
39 * kernel should be kept here, along with any global storage specific
40 * to this BSD variant.
41 */
42#include <fs/nfs/nfsport.h>
43#include <sys/sysctl.h>

--- 33 unchanged lines hidden (view full) ---

77 nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), "");
78
79/*
80 * Defines for malloc
81 * (Here for FreeBSD, since they allocate storage.)
82 */
83MALLOC_DEFINE(M_NEWNFSRVCACHE, "NFSD srvcache", "NFSD Server Request Cache");
84MALLOC_DEFINE(M_NEWNFSDCLIENT, "NFSD V4client", "NFSD V4 Client Id");
85MALLOC_DEFINE(M_NEWNFSDSTATE, "NFSD V4state", "NFSD V4 State (Openowner, Open, Lockowner, Delegation");
85MALLOC_DEFINE(M_NEWNFSDSTATE, "NFSD V4state",
86 "NFSD V4 State (Openowner, Open, Lockowner, Delegation");
86MALLOC_DEFINE(M_NEWNFSDLOCK, "NFSD V4lock", "NFSD V4 byte range lock");
87MALLOC_DEFINE(M_NEWNFSDLOCKFILE, "NFSD lckfile", "NFSD Open/Lock file");
88MALLOC_DEFINE(M_NEWNFSSTRING, "NFSD string", "NFSD V4 long string");
89MALLOC_DEFINE(M_NEWNFSUSERGROUP, "NFSD usrgroup", "NFSD V4 User/group map");
90MALLOC_DEFINE(M_NEWNFSDREQ, "NFS req", "NFS request header");
91MALLOC_DEFINE(M_NEWNFSFH, "NFS fh", "NFS file handle");
92MALLOC_DEFINE(M_NEWNFSCLOWNER, "NFSCL owner", "NFSCL Open Owner");
93MALLOC_DEFINE(M_NEWNFSCLOPEN, "NFSCL open", "NFSCL Open");
94MALLOC_DEFINE(M_NEWNFSCLDELEG, "NFSCL deleg", "NFSCL Delegation");
95MALLOC_DEFINE(M_NEWNFSCLCLIENT, "NFSCL client", "NFSCL Client");
96MALLOC_DEFINE(M_NEWNFSCLLOCKOWNER, "NFSCL lckown", "NFSCL Lock Owner");
97MALLOC_DEFINE(M_NEWNFSCLLOCK, "NFSCL lck", "NFSCL Lock");
98MALLOC_DEFINE(M_NEWNFSV4NODE, "NEWNFSnode", "New nfs vnode");
99MALLOC_DEFINE(M_NEWNFSDIRECTIO, "NEWdirectio", "New nfs Direct IO buffer");
87MALLOC_DEFINE(M_NEWNFSDLOCK, "NFSD V4lock", "NFSD V4 byte range lock");
88MALLOC_DEFINE(M_NEWNFSDLOCKFILE, "NFSD lckfile", "NFSD Open/Lock file");
89MALLOC_DEFINE(M_NEWNFSSTRING, "NFSD string", "NFSD V4 long string");
90MALLOC_DEFINE(M_NEWNFSUSERGROUP, "NFSD usrgroup", "NFSD V4 User/group map");
91MALLOC_DEFINE(M_NEWNFSDREQ, "NFS req", "NFS request header");
92MALLOC_DEFINE(M_NEWNFSFH, "NFS fh", "NFS file handle");
93MALLOC_DEFINE(M_NEWNFSCLOWNER, "NFSCL owner", "NFSCL Open Owner");
94MALLOC_DEFINE(M_NEWNFSCLOPEN, "NFSCL open", "NFSCL Open");
95MALLOC_DEFINE(M_NEWNFSCLDELEG, "NFSCL deleg", "NFSCL Delegation");
96MALLOC_DEFINE(M_NEWNFSCLCLIENT, "NFSCL client", "NFSCL Client");
97MALLOC_DEFINE(M_NEWNFSCLLOCKOWNER, "NFSCL lckown", "NFSCL Lock Owner");
98MALLOC_DEFINE(M_NEWNFSCLLOCK, "NFSCL lck", "NFSCL Lock");
99MALLOC_DEFINE(M_NEWNFSV4NODE, "NEWNFSnode", "New nfs vnode");
100MALLOC_DEFINE(M_NEWNFSDIRECTIO, "NEWdirectio", "New nfs Direct IO buffer");
100MALLOC_DEFINE(M_NEWNFSDIROFF, "Newnfscl_diroff", "New NFS directory offset data");
101MALLOC_DEFINE(M_NEWNFSDIROFF, "NFSCL diroffdiroff",
102 "New NFS directory offset data");
103MALLOC_DEFINE(M_NEWNFSDROLLBACK, "NFSD rollback",
104 "New NFS local lock rollback");
101
102/*
103 * Definition of mutex locks.
104 * newnfsd_mtx is used in nfsrvd_nfsd() to protect the nfs socket list
105 * and assorted other nfsd structures.
106 * Giant is used to protect the nfsd list and count, which is just
107 * updated when nfsd's start/stop and is grabbed for nfsrvd_dorpc()
108 * for the VFS ops.

--- 400 unchanged lines hidden ---
105
106/*
107 * Definition of mutex locks.
108 * newnfsd_mtx is used in nfsrvd_nfsd() to protect the nfs socket list
109 * and assorted other nfsd structures.
110 * Giant is used to protect the nfsd list and count, which is just
111 * updated when nfsd's start/stop and is grabbed for nfsrvd_dorpc()
112 * for the VFS ops.

--- 400 unchanged lines hidden ---