diff options
-rw-r--r-- | sys/nfs/nfs.h | 12 | ||||
-rw-r--r-- | sys/nfs/nfs_common.c | 11 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 11 | ||||
-rw-r--r-- | sys/nfsclient/nfs.h | 12 | ||||
-rw-r--r-- | sys/nfsclient/nfs_subs.c | 11 | ||||
-rw-r--r-- | sys/nfsclient/nfsargs.h | 12 | ||||
-rw-r--r-- | sys/nfsclient/nfsstats.h | 12 | ||||
-rw-r--r-- | sys/nfsserver/nfs.h | 12 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 11 | ||||
-rw-r--r-- | sys/nfsserver/nfsrvstats.h | 12 |
10 files changed, 0 insertions, 116 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 2d009a1..e07a4f5 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 50bd75a..28fce31 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -1107,17 +1107,6 @@ nfs_init(vfsp) nfsmount_zone = zinit("NFSMOUNT", sizeof(struct nfsmount), 0, 0, 1); - /* - * Check to see if major data structures haven't bloated. - */ - if (sizeof (struct nfssvc_sock) > NFS_SVCALLOC) { - printf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC); - printf("Try reducing NFS_UIDHASHSIZ\n"); - } - if (sizeof (struct nfsuid) > NFS_UIDALLOC) { - printf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC); - printf("Try unionizing the nu_nickname and nu_flag fields\n"); - } nfs_mount_type = vfsp->vfc_typenum; nfsrtt.pos = 0; rpc_vers = txdr_unsigned(RPC_VER2); diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 50bd75a..28fce31 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1107,17 +1107,6 @@ nfs_init(vfsp) nfsmount_zone = zinit("NFSMOUNT", sizeof(struct nfsmount), 0, 0, 1); - /* - * Check to see if major data structures haven't bloated. - */ - if (sizeof (struct nfssvc_sock) > NFS_SVCALLOC) { - printf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC); - printf("Try reducing NFS_UIDHASHSIZ\n"); - } - if (sizeof (struct nfsuid) > NFS_UIDALLOC) { - printf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC); - printf("Try unionizing the nu_nickname and nu_flag fields\n"); - } nfs_mount_type = vfsp->vfc_typenum; nfsrtt.pos = 0; rpc_vers = txdr_unsigned(RPC_VER2); diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index 2d009a1..e07a4f5 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 50bd75a..28fce31 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -1107,17 +1107,6 @@ nfs_init(vfsp) nfsmount_zone = zinit("NFSMOUNT", sizeof(struct nfsmount), 0, 0, 1); - /* - * Check to see if major data structures haven't bloated. - */ - if (sizeof (struct nfssvc_sock) > NFS_SVCALLOC) { - printf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC); - printf("Try reducing NFS_UIDHASHSIZ\n"); - } - if (sizeof (struct nfsuid) > NFS_UIDALLOC) { - printf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC); - printf("Try unionizing the nu_nickname and nu_flag fields\n"); - } nfs_mount_type = vfsp->vfc_typenum; nfsrtt.pos = 0; rpc_vers = txdr_unsigned(RPC_VER2); diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h index 2d009a1..e07a4f5 100644 --- a/sys/nfsclient/nfsargs.h +++ b/sys/nfsclient/nfsargs.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h index 2d009a1..e07a4f5 100644 --- a/sys/nfsclient/nfsstats.h +++ b/sys/nfsclient/nfsstats.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h index 2d009a1..e07a4f5 100644 --- a/sys/nfsserver/nfs.h +++ b/sys/nfsserver/nfs.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 50bd75a..28fce31 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -1107,17 +1107,6 @@ nfs_init(vfsp) nfsmount_zone = zinit("NFSMOUNT", sizeof(struct nfsmount), 0, 0, 1); - /* - * Check to see if major data structures haven't bloated. - */ - if (sizeof (struct nfssvc_sock) > NFS_SVCALLOC) { - printf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC); - printf("Try reducing NFS_UIDHASHSIZ\n"); - } - if (sizeof (struct nfsuid) > NFS_UIDALLOC) { - printf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC); - printf("Try unionizing the nu_nickname and nu_flag fields\n"); - } nfs_mount_type = vfsp->vfc_typenum; nfsrtt.pos = 0; rpc_vers = txdr_unsigned(RPC_VER2); diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h index 2d009a1..e07a4f5 100644 --- a/sys/nfsserver/nfsrvstats.h +++ b/sys/nfsserver/nfsrvstats.h @@ -114,18 +114,6 @@ #endif /* - * Expected allocation sizes for major data structures. If the actual size - * of the structure exceeds these sizes, then malloc() will be allocating - * almost twice the memory required. This is used in nfs_init() to warn - * the sysadmin that the size of a structure should be reduced. - * (These sizes are always a power of 2. If the kernel malloc() changes - * to one that does not allocate space in powers of 2 size, then this all - * becomes bunk!) - */ -#define NFS_SVCALLOC 256 -#define NFS_UIDALLOC 128 - -/* * Arguments to mount NFS */ #define NFS_ARGSVERSION 3 /* change when nfs_args changes */ |