aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJoseph Qi <joseph.qi@huawei.com>2016-03-25 14:21:29 -0700
committerSasha Levin <sasha.levin@oracle.com>2016-04-18 08:49:40 -0400
commit7700775a587cfaa5f5d7e52e100bae48cc6360c9 (patch)
treebb5dad386eadd9ae94039ce26808c2ecf6c8bc88 /mm
parent2fd6e6b6bbaf3822aaffe19f1d037e12c8f93c94 (diff)
ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list
[ Upstream commit be12b299a83fc807bbaccd2bcb8ec50cbb0cb55c ] When master handles convert request, it queues ast first and then returns status. This may happen that the ast is sent before the request status because the above two messages are sent by two threads. And right after the ast is sent, if master down, it may trigger BUG in dlm_move_lockres_to_recovery_list in the requested node because ast handler moves it to grant list without clear lock->convert_pending. So remove BUG_ON statement and check if the ast is processed in dlmconvert_remote. Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Reported-by: Yiwen Jiang <jiangyiwen@huawei.com> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> Cc: Tariq Saeed <tariq.x.saeed@oracle.com> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions