summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2011-04-17 20:01:32 +0000
committerrmacklem <rmacklem@FreeBSD.org>2011-04-17 20:01:32 +0000
commitdd87832ebdddf03dcada97199f9e3c2e3b3a7495 (patch)
treed189d8a3b58a8f0c4ad616fe47a2ec9397761de3
parentf6967ddf2b3dd548fbb783aa8e625404cbdf3332 (diff)
downloadFreeBSD-src-dd87832ebdddf03dcada97199f9e3c2e3b3a7495.zip
FreeBSD-src-dd87832ebdddf03dcada97199f9e3c2e3b3a7495.tar.gz
Get rid of the "nfscl: consider increasing kern.ipc.maxsockbuf"
message that was generated when doing experimental NFS client mounts. I put that message in because the krpc would hang with the default size for mounts that used large rsize/wsize values. Since the bug that caused these hangs was fixed by r213756, I think the message is no longer needed. MFC after: 2 weeks
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index b0756e0..8b5f391 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -143,7 +143,7 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq *nrp,
CLIENT *client;
struct netconfig *nconf;
struct socket *so;
- int one = 1, retries, error, printsbmax = 0;
+ int one = 1, retries, error;
struct thread *td = curthread;
/*
@@ -202,13 +202,8 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq *nrp,
return (error);
}
do {
- if (error != 0 && pktscale > 2) {
+ if (error != 0 && pktscale > 2)
pktscale--;
- if (printsbmax == 0) {
- printf("nfscl: consider increasing kern.ipc.maxsockbuf\n");
- printsbmax = 1;
- }
- }
if (nrp->nr_sotype == SOCK_DGRAM) {
if (nmp != NULL) {
sndreserve = (NFS_MAXDGRAMDATA + NFS_MAXPKTHDR) *
OpenPOWER on IntegriCloud