git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[DLM] wait for config check during join [6/6]
[safe/jmp/linux-2.6]
/
fs
/
dlm
/
member.c
diff --git
a/fs/dlm/member.c
b/fs/dlm/member.c
index
f08faec
..
073599d
100644
(file)
--- a/
fs/dlm/member.c
+++ b/
fs/dlm/member.c
@@
-233,6
+233,12
@@
int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
*neg_out = neg;
error = ping_members(ls);
+ if (!error || error == -EPROTO) {
+ /* new_lockspace() may be waiting to know if the config
+ is good or bad */
+ ls->ls_members_result = error;
+ complete(&ls->ls_members_done);
+ }
if (error)
goto out;