diff options
author | Joseph Qi <joseph.qi@huawei.com> | 2014-09-25 16:05:16 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:54:14 -0700 |
commit | 64bee3b2dab89d8d9e8a81f9485c24c8314fa4c3 (patch) | |
tree | b0406663a478e1c666798936e2ac6ca1692944a3 /arch/mips/jz4740/prom.c | |
parent | a0778f706909e867fde6304369a65c7ffad28e1e (diff) | |
download | linux-stable-64bee3b2dab89d8d9e8a81f9485c24c8314fa4c3.tar.gz linux-stable-64bee3b2dab89d8d9e8a81f9485c24c8314fa4c3.tar.bz2 linux-stable-64bee3b2dab89d8d9e8a81f9485c24c8314fa4c3.zip |
ocfs2/dlm: do not get resource spinlock if lockres is new
commit 5760a97c7143c208fa3a8f8cad0ed7dd672ebd28 upstream.
There is a deadlock case which reported by Guozhonghua:
https://oss.oracle.com/pipermail/ocfs2-devel/2014-September/010079.html
This case is caused by &res->spinlock and &dlm->master_lock
misordering in different threads.
It was introduced by commit 8d400b81cc83 ("ocfs2/dlm: Clean up refmap
helpers"). Since lockres is new, it doesn't not require the
&res->spinlock. So remove it.
Fixes: 8d400b81cc83 ("ocfs2/dlm: Clean up refmap helpers")
Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: joyce.xue <xuejiufei@huawei.com>
Reported-by: Guozhonghua <guozhonghua@h3c.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/jz4740/prom.c')
0 files changed, 0 insertions, 0 deletions