diff options
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/changelog/src/changelog-rpc.c | 8 | ||||
| -rw-r--r-- | xlators/features/changelog/src/changelog-rpc.h | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/src/changelog.c | 2 | ||||
| -rw-r--r-- | xlators/features/locks/src/posix.c | 10 |
4 files changed, 13 insertions, 9 deletions
diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c index 1d10eccf84f..4145608f3a7 100644 --- a/xlators/features/changelog/src/changelog-rpc.c +++ b/xlators/features/changelog/src/changelog-rpc.c @@ -8,6 +8,7 @@ cases as published by the Free Software Foundation. */ +#include "syscall.h" #include "changelog-rpc.h" #include "changelog-mem-types.h" #include "changelog-ev-handle.h" @@ -160,11 +161,12 @@ changelog_destroy_rpc_listner (xlator_t *this, changelog_priv_t *priv) } rpcsvc_t * -changelog_init_rpc_listner (xlator_t *this, changelog_priv_t *priv, +changelog_init_rpc_listener (xlator_t *this, changelog_priv_t *priv, rbuf_t *rbuf, int nr_dispatchers) { int ret = 0; char sockfile[UNIX_PATH_MAX] = {0,}; + rpcsvc_t *svcp; ret = changelog_init_rpc_threads (this, priv, rbuf, nr_dispatchers); if (ret) @@ -172,9 +174,11 @@ changelog_init_rpc_listner (xlator_t *this, changelog_priv_t *priv, CHANGELOG_MAKE_SOCKET_PATH (priv->changelog_brick, sockfile, UNIX_PATH_MAX); - return changelog_rpc_server_init (this, sockfile, NULL, + (void) sys_unlink (sockfile); + svcp = changelog_rpc_server_init (this, sockfile, NULL, changelog_rpcsvc_notify, changelog_programs); + return svcp; } void diff --git a/xlators/features/changelog/src/changelog-rpc.h b/xlators/features/changelog/src/changelog-rpc.h index 0df96684b6c..ae09a66aff3 100644 --- a/xlators/features/changelog/src/changelog-rpc.h +++ b/xlators/features/changelog/src/changelog-rpc.h @@ -21,7 +21,7 @@ #define CHANGELOG_RPC_PROGNAME "GlusterFS Changelog" rpcsvc_t * -changelog_init_rpc_listner (xlator_t *, changelog_priv_t *, rbuf_t *, int); +changelog_init_rpc_listener (xlator_t *, changelog_priv_t *, rbuf_t *, int); void changelog_destroy_rpc_listner (xlator_t *, changelog_priv_t *); diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c index a2d18ac4d61..a8bd6bde34b 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -2758,7 +2758,7 @@ changelog_init_rpc (xlator_t *this, changelog_priv_t *priv) if (!priv->rbuf) goto cleanup_thread; - rpc = changelog_init_rpc_listner (this, priv, + rpc = changelog_init_rpc_listener (this, priv, priv->rbuf, NR_DISPATCHERS); if (!rpc) goto cleanup_rbuf; diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index a6296ba12a9..0e75ad889be 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -3584,11 +3584,11 @@ pl_client_disconnect_cbk (xlator_t *this, client_t *client) pl_ctx = pl_ctx_get (client, this); - pl_inodelk_client_cleanup (this, pl_ctx); - - pl_entrylk_client_cleanup (this, pl_ctx); - - pl_metalk_client_cleanup (this, pl_ctx); + if (pl_ctx) { + pl_inodelk_client_cleanup (this, pl_ctx); + pl_entrylk_client_cleanup (this, pl_ctx); + pl_metalk_client_cleanup (this, pl_ctx); + } return 0; } |