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 <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index bd1a2db0cee5d0ab3f212707c4821b8aa971ad39..40c21025c1e5766fc8947057afa3b1c5f34c266a 100644 (file)
--- 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));
 
                        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));
        if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
                xlog(L_FATAL, "Could not bind name to socket: %s\n",
                                        strerror(errno));