summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/Makefile
diff options
context:
space:
mode:
authorJoseph Qi <joseph.qi@huawei.com>2016-09-19 14:43:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-19 15:36:16 -0700
commite6f0c6e6170fec175fe676495f29029aecdf486c (patch)
tree9f0ccd2923830ee0088a81d3abb5526d829c2832 /fs/ocfs2/Makefile
parent9bb627be47a574b764e162e8513d5db78d49e7f5 (diff)
downloadlinux-stable-e6f0c6e6170fec175fe676495f29029aecdf486c.tar.gz
linux-stable-e6f0c6e6170fec175fe676495f29029aecdf486c.tar.bz2
linux-stable-e6f0c6e6170fec175fe676495f29029aecdf486c.zip
ocfs2/dlm: fix race between convert and migration
Commit ac7cf246dfdb ("ocfs2/dlm: fix race between convert and recovery") checks if lockres master has changed to identify whether new master has finished recovery or not. This will introduce a race that right after old master does umount ( means master will change), a new convert request comes. In this case, it will reset lockres state to DLM_RECOVERING and then retry convert, and then fail with lockres->l_action being set to OCFS2_AST_INVALID, which will cause inconsistent lock level between ocfs2 and dlm, and then finally BUG. Since dlm recovery will clear lock->convert_pending in dlm_move_lockres_to_recovery_list, we can use it to correctly identify the race case between convert and recovery. So fix it. Fixes: ac7cf246dfdb ("ocfs2/dlm: fix race between convert and recovery") Link: http://lkml.kernel.org/r/57CE1569.8010704@huawei.com Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Signed-off-by: Jun Piao <piaojun@huawei.com> Cc: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> 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>
Diffstat (limited to 'fs/ocfs2/Makefile')
0 files changed, 0 insertions, 0 deletions