Commit 8fd3a98f authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse

[DLM] saved dlm message can be dropped

dlm_receive_message() returns 0 instead of returning 'error'.  What would
happen is that process_requestqueue would take a saved message off the
requestqueue and call receive_message on it.  receive_message would then
see that recovery had been aborted, set error to EINTR, and 'goto out',
expecting that the error would be returned.  Instead, 0 was always
returned, so process_requestqueue would think that the message had been
processed and delete it instead of saving it to process next time.  This
means the message (usually an unlock in my tests) would be lost.
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f1f1c1cc
...@@ -3018,7 +3018,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery) ...@@ -3018,7 +3018,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery)
{ {
struct dlm_message *ms = (struct dlm_message *) hd; struct dlm_message *ms = (struct dlm_message *) hd;
struct dlm_ls *ls; struct dlm_ls *ls;
int error; int error = 0;
if (!recovery) if (!recovery)
dlm_message_in(ms); dlm_message_in(ms);
...@@ -3135,7 +3135,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery) ...@@ -3135,7 +3135,7 @@ int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery)
out: out:
dlm_put_lockspace(ls); dlm_put_lockspace(ls);
dlm_astd_wake(); dlm_astd_wake();
return 0; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment