diff options
| author | Milind Changire <mchangir@redhat.com> | 2019-02-15 14:20:07 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2019-03-02 11:54:24 +0000 |
| commit | 4cb1d6d94ac85c5e79171f8989b545ca098b61d9 (patch) | |
| tree | 2d6a178aa17a6785812a5ddec1bd21feac9f810c /libglusterfs/src/event.c | |
| parent | cd6795c5e8ebdf23c6fd350d8df49e5b22b09056 (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 'libglusterfs/src/event.c')
| -rw-r--r-- | libglusterfs/src/event.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c index d6023133626..527df5106fc 100644 --- a/libglusterfs/src/event.c +++ b/libglusterfs/src/event.c @@ -159,12 +159,12 @@ out: return ret; } -int +void poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out, int poll_in, int poll_err, char event_thread_exit) { struct event_destroy_data *destroy = NULL; - int readfd = -1, ret = -1; + int readfd = -1; char buf = '\0'; destroy = data; @@ -176,11 +176,10 @@ poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out, while (sys_read(readfd, &buf, 1) > 0) { } - ret = 0; out: event_handled(destroy->pool, fd, idx, gen); - return ret; + return; } /* This function destroys all the poller threads. |