Revision ac7cf246dfdbec3d8fed296c7bf30e16f5099dac authored by Joseph Qi on 25 March 2016, 21:21:26 UTC, committed by Linus Torvalds on 25 March 2016, 23:37:42 UTC
There is a race window between dlmconvert_remote and dlm_move_lockres_to_recovery_list, which will cause a lock with OCFS2_LOCK_BUSY in grant list, thus system hangs. dlmconvert_remote { spin_lock(&res->spinlock); list_move_tail(&lock->list, &res->converting); lock->convert_pending = 1; spin_unlock(&res->spinlock); status = dlm_send_remote_convert_request(); >>>>>> race window, master has queued ast and return DLM_NORMAL, and then down before sending ast. this node detects master down and calls dlm_move_lockres_to_recovery_list, which will revert the lock to grant list. Then OCFS2_LOCK_BUSY won't be cleared as new master won't send ast any more because it thinks already be authorized. spin_lock(&res->spinlock); lock->convert_pending = 0; if (status != DLM_NORMAL) dlm_revert_pending_convert(res, lock); spin_unlock(&res->spinlock); } In this case, check if res->state has DLM_LOCK_RES_RECOVERING bit set (res is still in recovering) or res master changed (new master has finished recovery), reset the status to DLM_RECOVERING, then it will retry convert. Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Reported-by: Yiwen Jiang <jiangyiwen@huawei.com> Reviewed-by: 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>
1 parent 2888868
File | Mode | Size |
---|---|---|
chips | ||
devices | ||
lpddr | ||
maps | ||
nand | ||
onenand | ||
spi-nor | ||
tests | ||
ubi | ||
Kconfig | -rw-r--r-- | 11.7 KB |
Makefile | -rw-r--r-- | 1.1 KB |
afs.c | -rw-r--r-- | 6.1 KB |
ar7part.c | -rw-r--r-- | 3.9 KB |
bcm47xxpart.c | -rw-r--r-- | 8.5 KB |
bcm63xxpart.c | -rw-r--r-- | 8.4 KB |
cmdlinepart.c | -rw-r--r-- | 10.7 KB |
ftl.c | -rw-r--r-- | 31.3 KB |
inftlcore.c | -rw-r--r-- | 24.5 KB |
inftlmount.c | -rw-r--r-- | 22.4 KB |
mtd_blkdevs.c | -rw-r--r-- | 13.2 KB |
mtdblock.c | -rw-r--r-- | 9.7 KB |
mtdblock_ro.c | -rw-r--r-- | 2.5 KB |
mtdchar.c | -rw-r--r-- | 26.0 KB |
mtdconcat.c | -rw-r--r-- | 22.8 KB |
mtdcore.c | -rw-r--r-- | 35.0 KB |
mtdcore.h | -rw-r--r-- | 876 bytes |
mtdoops.c | -rw-r--r-- | 11.8 KB |
mtdpart.c | -rw-r--r-- | 23.4 KB |
mtdsuper.c | -rw-r--r-- | 5.5 KB |
mtdswap.c | -rw-r--r-- | 35.3 KB |
nftlcore.c | -rw-r--r-- | 23.0 KB |
nftlmount.c | -rw-r--r-- | 26.0 KB |
ofpart.c | -rw-r--r-- | 5.6 KB |
redboot.c | -rw-r--r-- | 8.2 KB |
rfd_ftl.c | -rw-r--r-- | 18.3 KB |
sm_ftl.c | -rw-r--r-- | 30.2 KB |
sm_ftl.h | -rw-r--r-- | 2.5 KB |
ssfdc.c | -rw-r--r-- | 11.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...