diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-01-29 17:12:31 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-02-02 14:20:19 -0800 |
| commit | a4b91965d39d5d53b470d6aa62cba155a6f3ffe1 (patch) | |
| tree | 823d8730f730e41204c62f645953fac5de9315a3 /fs | |
| parent | 554e7f9e043e29da79c044f7a55efe4fad40701e (diff) | |
| download | linux-3.10-a4b91965d39d5d53b470d6aa62cba155a6f3ffe1.tar.gz linux-3.10-a4b91965d39d5d53b470d6aa62cba155a6f3ffe1.tar.bz2 linux-3.10-a4b91965d39d5d53b470d6aa62cba155a6f3ffe1.zip | |
ocfs2: Wakeup the downconvert thread after a successful cancel convert
When two nodes holding PR locks on a resource concurrently attempt to
upconvert the locks to EX, the master sends a BAST to one of the nodes. This
message tells that node to first cancel convert the upconvert request,
followed by downconvert to a NL. Only when this lock is downconverted to NL,
can the master upconvert the first node's lock to EX.
While the fs was doing the cancel convert, it was forgetting to wake up the
dc thread after a successful cancel, leading to a deadlock.
Reported-and-Tested-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index b0c4cadd4c4..206a2370876 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -2860,6 +2860,10 @@ static void ocfs2_unlock_ast(void *opaque, int error) case OCFS2_UNLOCK_CANCEL_CONVERT: mlog(0, "Cancel convert success for %s\n", lockres->l_name); lockres->l_action = OCFS2_AST_INVALID; + /* Downconvert thread may have requeued this lock, we + * need to wake it. */ + if (lockres->l_flags & OCFS2_LOCK_BLOCKED) + ocfs2_wake_downconvert_thread(ocfs2_get_lockres_osb(lockres)); break; case OCFS2_UNLOCK_DROP_LOCK: lockres->l_level = DLM_LOCK_IV; |