diff options
| author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 13:54:07 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 14:43:12 -0700 |
| commit | b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07 (patch) | |
| tree | b1d19839e9e7795fb1d86270c90008058e8860f7 /fs/ocfs2/dlm/dlmmaster.c | |
| parent | c27069e6cfa242a3b84eb3442934c6fe51ee9066 (diff) | |
| download | linux-stable-b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07.tar.gz linux-stable-b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07.tar.bz2 linux-stable-b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07.zip | |
ocfs2: wait for recovery when starting lock mastery
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 78ba77bf3a77..ed1601d1831c 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -899,6 +899,9 @@ redo_request: } else wait_on_recovery = 0; spin_unlock(&dlm->spinlock); + + if (wait_on_recovery) + dlm_wait_for_node_recovery(dlm, bit, 10000); } /* must wait for lock to be mastered elsewhere */ |