Deleted Added
full compact
nfs_commonport.c (220648) nfs_commonport.c (220751)
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 220648 2011-04-14 23:46:15Z rmacklem $");
35__FBSDID("$FreeBSD: head/sys/fs/nfs/nfs_commonport.c 220751 2011-04-17 18:56:17Z 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>

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

65struct callout newnfsd_callout;
66void (*nfsd_call_servertimer)(void) = NULL;
67void (*ncl_call_invalcaches)(struct vnode *) = NULL;
68
69static int nfs_realign_test;
70static int nfs_realign_count;
71
72SYSCTL_NODE(_vfs, OID_AUTO, newnfs, CTLFLAG_RW, 0, "New NFS filesystem");
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>

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

65struct callout newnfsd_callout;
66void (*nfsd_call_servertimer)(void) = NULL;
67void (*ncl_call_invalcaches)(struct vnode *) = NULL;
68
69static int nfs_realign_test;
70static int nfs_realign_count;
71
72SYSCTL_NODE(_vfs, OID_AUTO, newnfs, CTLFLAG_RW, 0, "New NFS filesystem");
73SYSCTL_INT(_vfs_newnfs, OID_AUTO, newnfs_realign_test, CTLFLAG_RW, &nfs_realign_test, 0, "");
74SYSCTL_INT(_vfs_newnfs, OID_AUTO, newnfs_realign_count, CTLFLAG_RW, &nfs_realign_count, 0, "");
75SYSCTL_INT(_vfs_newnfs, OID_AUTO, nfs4acl_enable, CTLFLAG_RW, &nfsrv_useacl, 0, "");
73SYSCTL_INT(_vfs_newnfs, OID_AUTO, realign_test, CTLFLAG_RW, &nfs_realign_test,
74 0, "Number of realign tests done");
75SYSCTL_INT(_vfs_newnfs, OID_AUTO, realign_count, CTLFLAG_RW, &nfs_realign_count,
76 0, "Number of mbuf realignments done");
77SYSCTL_INT(_vfs_newnfs, OID_AUTO, nfs4acl_enable, CTLFLAG_RW, &nfsrv_useacl,
78 0, "Enable NFSv4 ACLs");
76SYSCTL_STRING(_vfs_newnfs, OID_AUTO, callback_addr, CTLFLAG_RW,
79SYSCTL_STRING(_vfs_newnfs, OID_AUTO, callback_addr, CTLFLAG_RW,
77 nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), "");
80 nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr),
81 "NFSv4 callback addr for server to use");
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",

--- 434 unchanged lines hidden ---
82
83/*
84 * Defines for malloc
85 * (Here for FreeBSD, since they allocate storage.)
86 */
87MALLOC_DEFINE(M_NEWNFSRVCACHE, "NFSD srvcache", "NFSD Server Request Cache");
88MALLOC_DEFINE(M_NEWNFSDCLIENT, "NFSD V4client", "NFSD V4 Client Id");
89MALLOC_DEFINE(M_NEWNFSDSTATE, "NFSD V4state",

--- 434 unchanged lines hidden ---