From f75c15b477a61c74a41361e2b42fd385c6f6af53 Mon Sep 17 00:00:00 2001 From: Christine Caulfield Date: Wed, 25 Feb 2009 14:33:00 +0000 Subject: [PATCH] Fix error returns in clvmd-corosync interface to DLM. Thanks to Xinwei Hu for spotting this. --- WHATS_NEW | 1 + daemons/clvmd/clvmd-corosync.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index 19305a27e..8c89bd726 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.45 - =================================== + Fix error returns in clvmd-corosync interface to DLM. Add --refresh to vgchange and vgmknodes man pages. Fixed bug where lvresize option -t was not properly passed to fsadm. Using argv[] list in exec_cmd() to allow more params for external commands. diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c index 4807a15f3..27819ace8 100644 --- a/daemons/clvmd/clvmd-corosync.c +++ b/daemons/clvmd/clvmd-corosync.c @@ -478,6 +478,12 @@ static int _lock_resource(const char *resource, int mode, int flags, int *lockid DEBUGLOG("dlm_ls_lock returned %d\n", errno); return err; } + if (lksb.sb_status != 0) + { + DEBUGLOG("dlm_ls_lock returns lksb.sb_status %d\n", lksb.sb_status); + errno = lksb.sb_status; + return -1; + } DEBUGLOG("lock_resource returning %d, lock_id=%x\n", err, lksb.sb_lkid); @@ -504,6 +510,13 @@ static int _unlock_resource(const char *resource, int lockid) DEBUGLOG("Unlock returned %d\n", err); return err; } + if (lksb.sb_status != 0) + { + DEBUGLOG("dlm_ls_unlock_wait returns lksb.sb_status: %d\n", lksb.sb_status); + errno = lksb.sb_status; + return -1; + } + return 0; } @@ -568,7 +581,7 @@ static int _get_cluster_name(char *buf, int buflen) confdb_handle_t handle; int result; int namelen = buflen; - unsigned int cluster_handle; + hdb_handle_t cluster_handle; confdb_callbacks_t callbacks = { .confdb_key_change_notify_fn = NULL, .confdb_object_create_change_notify_fn = NULL, -- 2.43.5