NACK. You can't do this. The saLckResourceLock function can block --
that is why we create a new ipc connection.
On Mon, Jun 08, 2009 at 05:25:31PM +0200, Jan Friesse wrote:
> This seems to me like a resudium of rewritten code and it looks like
> it is not used.
> ---
> trunk/lib/lck.c | 23 +++--------------------
> 1 files changed, 3 insertions(+), 20 deletions(-)
>
> diff --git a/trunk/lib/lck.c b/trunk/lib/lck.c
> index e1c2410..4e962dd 100644
> --- a/trunk/lib/lck.c
> +++ b/trunk/lib/lck.c
> @@ -763,8 +763,6 @@ saLckResourceLock (
> struct iovec iov;
> SaAisErrorT error = SA_AIS_OK;
>
> - hdb_handle_t ipc_handle;
> -
> /* DEBUG */
> printf ("[DEBUG]: saLckResourceLock\n");
>
> @@ -808,17 +806,6 @@ saLckResourceLock (
> goto error_destroy;
> }
>
> - error = coroipcc_service_connect (
> - COROSYNC_SOCKET_NAME,
> - LCK_SERVICE,
> - IPC_REQUEST_SIZE,
> - IPC_RESPONSE_SIZE,
> - IPC_DISPATCH_SIZE,
> - &ipc_handle);
> - if (error != SA_AIS_OK) {
> - goto error_put_destroy;
> - }
> -
> lckLockIdInstance->ipc_handle = lckResourceInstance->ipc_handle;
> lckLockIdInstance->resource_id = lckResourceInstance->resource_id;
> lckLockIdInstance->lck_handle = lckResourceInstance->lck_handle;
> @@ -842,24 +829,22 @@ saLckResourceLock (
> iov.iov_len = sizeof (struct req_lib_lck_resourcelock);
>
> error = coroipcc_msg_send_reply_receive (
> - ipc_handle,
> + lckLockIdInstance->ipc_handle,
> &iov,
> 1,
> &res_lib_lck_resourcelock,
> sizeof (struct res_lib_lck_resourcelock));
>
> if (error != SA_AIS_OK) {
> - goto error_disconnect;
> + goto error_put_destroy;
> }
>
> if (res_lib_lck_resourcelock.header.error != SA_AIS_OK) {
> *lockStatus = res_lib_lck_resourcelock.lock_status;
> error = res_lib_lck_resourcelock.header.error;
> - goto error_disconnect;
> + goto error_put_destroy;
> }
>
> - coroipcc_service_disconnect (ipc_handle);
> -
> list_init (&lckLockIdInstance->list);
> list_add_tail (&lckLockIdInstance->list,
> &lckResourceInstance->lock_id_list);
>
> @@ -870,8 +855,6 @@ saLckResourceLock (
>
> return (error);
>
> -error_disconnect:
> - coroipcc_service_disconnect (ipc_handle);
> error_put_destroy:
> hdb_handle_put (&lckLockIdHandleDatabase, *lockId);
> error_destroy:
> --
> 1.5.5.6
>
> _______________________________________________
> Openais mailing list
> [email protected]
> https://lists.linux-foundation.org/mailman/listinfo/openais
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
