msg/SimpleMessenger: error out misplace in set_socket_options

Signed-off-by: wangzhengyong@cmss.chinamobile.com

diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index b2b5fcbe9243f03f95c80bc019c33b032465ec80..e5f24bc8e38cd64ec78daa62f237f968fe55f608 100644 (file)
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -923,15 +923,15 @@ void Pipe::set_socket_options()
 
     if (peer_addr.get_family() == AF_INET) {
       r = ::setsockopt(sd, IPPROTO_IP, IP_TOS, &iptos, sizeof(iptos));
-      r = -errno;
       if (r < 0) {
+        r = -errno;
         ldout(msgr->cct,0) << "couldn't set IP_TOS to " << iptos
                            << ": " << cpp_strerror(r) << dendl;
       }
     } else if (peer_addr.get_family() == AF_INET6) {
       r = ::setsockopt(sd, IPPROTO_IPV6, IPV6_TCLASS, &iptos, sizeof(iptos));
-      r = -errno;
       if (r < 0) {
+        r = -errno;
         ldout(msgr->cct,0) << "couldn't set IPV6_TCLASS to " << iptos
                            << ": " << cpp_strerror(r) << dendl;
       }