summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorMilind Changire <mchangir@redhat.com>2019-02-15 14:20:07 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2019-03-02 11:54:24 +0000
commit4cb1d6d94ac85c5e79171f8989b545ca098b61d9 (patch)
tree2d6a178aa17a6785812a5ddec1bd21feac9f810c /rpc
parentcd6795c5e8ebdf23c6fd350d8df49e5b22b09056 (diff)
socket: socket event handlers now return void
Problem: Returning any value from socket event handlers to the event sub-system doesn't make sense since event sub-system cannot handle socket sub-system errors. Solution: Change return type of all socket event handlers to 'void' mainline: > Change-Id: I70dc2c57f12b7ea2fae41120f71aa0d7fe0b2b6f > Fixes: bz#1651246 > Signed-off-by: Milind Changire <mchangir@redhat.com> > Reviewed-on: https://review.gluster.org/c/glusterfs/+/22221 Change-Id: I70dc2c57f12b7ea2fae41120f71aa0d7fe0b2b6f Fixes: bz#1683900 Signed-off-by: Milind Changire <mchangir@redhat.com> (cherry picked from commit 776ba851c6ee6c265253d44cf1d6e4e3d4a21772)
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 1762e913d27..fa0e0f20901 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -2847,7 +2847,7 @@ socket_complete_connection(rpc_transport_t *this)
}
/* reads rpc_requests during pollin */
-static int
+static void
socket_event_handler(int fd, int idx, int gen, void *data, int poll_in,
int poll_out, int poll_err, char event_thread_died)
{
@@ -2861,7 +2861,7 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in,
if (event_thread_died) {
/* to avoid duplicate notifications, notify only for listener sockets */
- return 0;
+ return;
}
GF_VALIDATE_OR_GOTO("socket", this, out);
@@ -2900,7 +2900,7 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in,
if (ret > 0) {
gf_log(this->name, GF_LOG_TRACE,
"(sock:%d) returning to wait on socket", priv->sock);
- return 0;
+ return;
}
} else {
char *sock_type = (priv->is_server ? "Server" : "Client");
@@ -2955,10 +2955,10 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in,
}
out:
- return ret;
+ return;
}
-static int
+static void
socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in,
int poll_out, int poll_err, char event_thread_died)
{
@@ -2987,7 +2987,7 @@ socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in,
if (event_thread_died) {
rpc_transport_notify(this, RPC_TRANSPORT_EVENT_THREAD_DIED,
(void *)(unsigned long)gen);
- return 0;
+ return;
}
/* NOTE:
@@ -3202,7 +3202,7 @@ socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in,
}
}
out:
- return ret;
+ return;
}
static int