From: Yan Jun <yan.jun8@zte.com.cn>
Date: Mon, 25 Apr 2016 01:45:20 +0000 (+0800)
Subject: msg/async: fix some return values and misspellings.
X-Git-Tag: v10.2.3~136^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6597fab4cc27de6d6f1dcfa070ed401612bfed76;p=ceph.git

msg/async: fix some return values and misspellings.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
(cherry picked from commit 0519f938e13d0adf53c1328fd636b9fa5e6c5b93)
---

diff --git a/src/msg/async/EventKqueue.cc b/src/msg/async/EventKqueue.cc
index 54fef5f22de4..d546462c2ed8 100644
--- a/src/msg/async/EventKqueue.cc
+++ b/src/msg/async/EventKqueue.cc
@@ -28,7 +28,7 @@ int KqueueDriver::init(int nevent)
   if (!events) {
     lderr(cct) << __func__ << " unable to malloc memory: "
                            << cpp_strerror(errno) << dendl;
-    return -errno;
+    return -ENOMEM;
   }
   memset(events, 0, sizeof(struct kevent)*nevent);
 
@@ -58,7 +58,7 @@ int KqueueDriver::add_event(int fd, int cur_mask, int add_mask)
     if (kevent(kqfd, &ke, 1, NULL, 0, NULL) == -1) {
       lderr(cct) << __func__ << " unable to add event: "
                              << cpp_strerror(errno) << dendl;
-      return -1;
+      return -errno;
     }
   }
 
@@ -80,7 +80,7 @@ int KqueueDriver::del_event(int fd, int cur_mask, int delmask)
     if ((r = kevent(kqfd, &ke, 1, NULL, 0, NULL)) < 0) {
       lderr(cct) << __func__ << " kevent: delete fd=" << fd << " mask=" << filter
                  << " failed." << cpp_strerror(errno) << dendl;
-      return r;
+      return -errno;
     }
   }
   return 0;
diff --git a/src/msg/async/net_handler.cc b/src/msg/async/net_handler.cc
index ba63eec4e5c0..2a892768792c 100644
--- a/src/msg/async/net_handler.cc
+++ b/src/msg/async/net_handler.cc
@@ -38,7 +38,7 @@ int NetHandler::create_socket(int domain, bool reuse_addr)
     return -errno;
   }
 
-  /* Make sure connection-intensive things like the benckmark
+  /* Make sure connection-intensive things like the benchmark
    * will be able to close/open sockets a zillion of times */
   if (reuse_addr) {
     if (::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {