diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2008-03-01 14:04:25 -0800 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-03-10 15:14:17 -0700 |
| commit | c824c3c723f2e37a00b3b739a55b28de595fd72e (patch) | |
| tree | c5cd618420cc66f238f0273d6d59dbed46099dca /fs | |
| parent | 535f7026fddafce6d0a0524db01a432c23a0a7b4 (diff) | |
| download | linux-c824c3c723f2e37a00b3b739a55b28de595fd72e.tar.bz2 | |
ocfs2/dlm: dlm_thread should not sleep while holding the dlm_spinlock
This patch addresses the bug in which the dlm_thread could go to sleep
while holding the dlm_spinlock.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/dlm/dlmthread.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index cebd089f8955..4060bb328bc8 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -176,12 +176,14 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, res->lockname.name, master); if (!master) { + /* drop spinlock... retake below */ + spin_unlock(&dlm->spinlock); + spin_lock(&res->spinlock); /* This ensures that clear refmap is sent after the set */ __dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG); spin_unlock(&res->spinlock); - /* drop spinlock to do messaging, retake below */ - spin_unlock(&dlm->spinlock); + /* clear our bit from the master's refmap, ignore errors */ ret = dlm_drop_lockres_ref(dlm, res); if (ret < 0) { |