From ec2e72c3e6f13dfa049598427c56115f1cbed16c Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Fri, 26 Sep 2008 16:11:57 -0400 Subject: [PATCH 1/1] nfs-utils: Remove excess log reporting Clean up: The makesock() function already reports an error if it can't create a socket. Remove the redundant error check and logging done in rpc_init() after a makesock() call. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- support/nfs/rpcmisc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index bb68203..eb5629a 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -89,10 +89,8 @@ rpc_init(char *name, int prog, int vers, } if (defport == 0) sock = RPC_ANYSOCK; - else if ((sock = makesock(defport, IPPROTO_UDP)) < 0) { - xlog(L_FATAL, "%s: cannot make a UDP socket\n", - name); - } + else + sock = makesock(defport, IPPROTO_UDP); } if (sock == RPC_ANYSOCK) sock = svcudp_socket (prog, 1); @@ -119,10 +117,8 @@ rpc_init(char *name, int prog, int vers, } if (defport == 0) sock = RPC_ANYSOCK; - else if ((sock = makesock(defport, IPPROTO_TCP)) < 0) { - xlog(L_FATAL, "%s: cannot make a TCP socket\n", - name); - } + else + sock = makesock(defport, IPPROTO_TCP); } if (sock == RPC_ANYSOCK) sock = svctcp_socket (prog, 1); -- 2.39.2