]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: normalize notify return code
authorHaomai Wang <haomaiwang@gmail.com>
Wed, 19 Aug 2015 08:15:40 +0000 (16:15 +0800)
committerHaomai Wang <haomai@xsky.com>
Tue, 1 Dec 2015 02:03:15 +0000 (10:03 +0800)
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/common/event_socket.h

index 7bbd7ec33e25f66bcdf0178925d3a84257aa1369..6e137b674a0520d1a54fe7ab24c035053d1dc2c1 100644 (file)
@@ -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;
   }
 };