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 |
---|---|---|
arm | ||
arm64 | ||
filesystems | ||
video4linux | ||
CodingStyle | -rw-r--r-- | 28.9 KB |
HOWTO | -rw-r--r-- | 27.2 KB |
IRQ.txt | -rw-r--r-- | 2.0 KB |
SecurityBugs | -rw-r--r-- | 2.7 KB |
SubmittingDrivers | -rw-r--r-- | 7.4 KB |
SubmittingPatches | -rw-r--r-- | 18.9 KB |
basic_profiling.txt | -rw-r--r-- | 2.7 KB |
email-clients.txt | -rw-r--r-- | 9.3 KB |
gpio.txt | -rw-r--r-- | 31.6 KB |
io_ordering.txt | -rw-r--r-- | 2.9 KB |
magic-number.txt | -rw-r--r-- | 9.6 KB |
oops-tracing.txt | -rw-r--r-- | 11.3 KB |
sparse.txt | -rw-r--r-- | 3.8 KB |
stable_api_nonsense.txt | -rw-r--r-- | 9.6 KB |
stable_kernel_rules.txt | -rw-r--r-- | 3.7 KB |
volatile-considered-harmful.txt | -rw-r--r-- | 6.4 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...