From: Chuck Lever Date: Fri, 26 Sep 2008 17:28:10 +0000 (-0400) Subject: nfs-utils: remove disabled code from support/nfs/rpcmisc.c X-Git-Tag: nfs-utils-1-1-4~18 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=a663cf4c59e9b4fa56d8ca976c582ccf929140d2;ds=sidebyside nfs-utils: remove disabled code from support/nfs/rpcmisc.c After some recent discussions, we want to rely on the kernel's network layer to autotune socket buffers. Since this code is already disabled in support/nfs/rpcmisc.c (and has been for some time), let's just remove it. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index bd1a2db..40c2102 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -192,22 +192,6 @@ int makesock(int port, int proto) xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno)); -#if 0 - /* I was told it didn't work with gigabit ethernet. - Don't bothet with it. H.J. */ -#ifdef SO_SNDBUF - { - int sblen, rblen; - - /* 1024 for rpc & transport overheads */ - sblen = rblen = socksz + 1024; - if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &sblen, sizeof sblen) < 0 || - setsockopt(s, SOL_SOCKET, SO_RCVBUF, &rblen, sizeof rblen) < 0) - xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno)); - } -#endif /* SO_SNDBUF */ -#endif - if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) { xlog(L_FATAL, "Could not bind name to socket: %s\n", strerror(errno));