| commit | c93e8d313c55fc7b02e60f7904b1c30317db9919 | |
| author | Wengang Wang <wen.gang.wang@oracle.com> | |
| Fri, 30 Jul 2010 15:18:00 +0000 (30 23:18 +0800) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Thu, 26 Aug 2010 23:43:21 +0000 (26 16:43 -0700) | ||
| tree | ae8e050e02909d4816e7056e9e09523068003ef9 | treesnapshot (tar.gz zip) |
| parent | 1dbe8a5be1d1138d296ddd6029cbaebbfffa050e | commitdiff |
ocfs2/dlm: remove potential deadlock -V3
commit b11f1f1ab73fd358b1b734a9427744802202ba68 upstream.
When we need to take both dlm_domain_lock and dlm->spinlock, we should take
them in order of: dlm_domain_lock then dlm->spinlock.
There is pathes disobey this order. That is calling dlm_lockres_put() with
dlm->spinlock held in dlm_run_purge_list. dlm_lockres_put() calls dlm_put() at
the ref and dlm_put() locks on dlm_domain_lock.
Fix:
Don't grab/put the dlm when the initialising/releasing lockres.
That grab is not required because we don't call dlm_unregister_domain()
based on refcount.
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b11f1f1ab73fd358b1b734a9427744802202ba68 upstream.
When we need to take both dlm_domain_lock and dlm->spinlock, we should take
them in order of: dlm_domain_lock then dlm->spinlock.
There is pathes disobey this order. That is calling dlm_lockres_put() with
dlm->spinlock held in dlm_run_purge_list. dlm_lockres_put() calls dlm_put() at
the ref and dlm_put() locks on dlm_domain_lock.
Fix:
Don't grab/put the dlm when the initialising/releasing lockres.
That grab is not required because we don't call dlm_unregister_domain()
based on refcount.
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| fs/ocfs2/dlm/dlmmaster.c | diffblobblamehistory |