From: Haomai Wang <haomaiwang@gmail.com>
Date: Wed, 19 Aug 2015 08:15:40 +0000 (+0800)
Subject: librbd: normalize notify return code
X-Git-Tag: v10.0.2~142^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39327146be62ef8580f1e5c450b2ca957ba99d1b;p=ceph.git

librbd: normalize notify return code

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/common/event_socket.h b/src/common/event_socket.h
index 7bbd7ec33e2..6e137b674a0 100644
--- a/src/common/event_socket.h
+++ b/src/common/event_socket.h
@@ -39,23 +39,29 @@ class EventSocket {
     return -1;
   }
   int notify() {
+    int ret;
     switch (type) {
       case EVENT_SOCKET_TYPE_PIPE:
       {
         char buf[1];
         buf[0] = 'i';
-        return write(socket, buf, 1);
+        ret = write(socket, buf, 1);
+        if (ret < 0)
+          ret = -errno;
       }
       case EVENT_SOCKET_TYPE_EVENTFD:
       {
         uint64_t value = 1;
-        return write(socket, &value, sizeof (value));
+        ret = write(socket, &value, sizeof (value));
+        if (ret < 0)
+          ret = -errno;
       }
       default:
       {
-        return -1;
+        ret = -1;
       }
     }
+    return ret;
   }
 };