mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Fix error returns in clvmd-corosync interface to DLM.
Thanks to Xinwei Hu for spotting this.
This commit is contained in:
parent
82c29eedc0
commit
b36d715a92
@ -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.
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user