Joseph Qi e6f0c6e617 ocfs2/dlm: fix race between convert and migration ... Commit ac7cf246df ("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: ac7cf246df ("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>		2016-09-19 15:36:16 -07:00
..
dlmapi.h	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
dlmast.c	o2dlm: fix NULL pointer dereference in o2dlm_blocking_ast_wrapper	2015-02-10 14:30:30 -08:00
dlmcommon.h	ocfs2/dlm: continue to purge recovery lockres when recovery master goes down	2016-08-02 17:31:41 -04:00
dlmconvert.c	ocfs2/dlm: fix race between convert and migration	2016-09-19 15:36:16 -07:00
dlmconvert.h
dlmdebug.c	ocfs2/dlm: fix memory leak of dlm_debug_ctxt	2016-07-26 16:19:19 -07:00
dlmdebug.h	ocfs2/dlm: fix memory leak of dlm_debug_ctxt	2016-07-26 16:19:19 -07:00
dlmdomain.c	qstr: constify instances in ocfs2	2016-07-20 23:30:06 -04:00
dlmdomain.h	ocfs2: dlm: dlmdomain: remove unused function	2015-02-10 14:30:29 -08:00
dlmlock.c	ocfs2: remove NULL assignments on static	2014-06-04 16:53:53 -07:00
dlmmaster.c	ocfs2/dlm: continue to purge recovery lockres when recovery master goes down	2016-08-02 17:31:41 -04:00
dlmrecovery.c	ocfs2/dlm: continue to purge recovery lockres when recovery master goes down	2016-08-02 17:31:41 -04:00
dlmthread.c	ocfs2/dlm: continue to purge recovery lockres when recovery master goes down	2016-08-02 17:31:41 -04:00
dlmunlock.c	ocfs2/dlm: return appropriate value when dlm_grab() returns NULL	2016-01-14 16:00:49 -08:00
Makefile	ocfs2: remove versioning information	2014-01-21 16:19:41 -08:00