|
|
@@ -787,6 +787,7 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
|
|
|
{
|
|
|
struct dlm_lock_request lr;
|
|
|
int ret;
|
|
|
+ int status;
|
|
|
|
|
|
mlog(0, "\n");
|
|
|
|
|
|
@@ -800,13 +801,15 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
|
|
|
|
|
|
// send message
|
|
|
ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key,
|
|
|
- &lr, sizeof(lr), request_from, NULL);
|
|
|
+ &lr, sizeof(lr), request_from, &status);
|
|
|
|
|
|
/* negative status is handled by caller */
|
|
|
if (ret < 0)
|
|
|
mlog(ML_ERROR, "%s: Error %d send LOCK_REQUEST to node %u "
|
|
|
"to recover dead node %u\n", dlm->name, ret,
|
|
|
request_from, dead_node);
|
|
|
+ else
|
|
|
+ ret = status;
|
|
|
// return from here, then
|
|
|
// sleep until all received or error
|
|
|
return ret;
|