From 68c787757857325100d23c04b47da8a646c14c49 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 25 Jan 2016 15:55:38 +0800 Subject: [PATCH] objecter: avoid recursive lock of Objecter::rwlock Objecter::RequestStateHook::call() already takes read lock of Objecter::rwlock. Taking read lock again in Objecter::_dump_foo_ops() can trigger lockdep assertion. Signed-off-by: Yan, Zheng --- src/osdc/Objecter.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 63d89f553ff..9bfbb06550a 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -4364,7 +4364,6 @@ void Objecter::_dump_ops(const OSDSession *s, Formatter *fmt) void Objecter::dump_ops(Formatter *fmt) { fmt->open_array_section("ops"); - rwlock.get_read(); for (map::const_iterator siter = osd_sessions.begin(); siter != osd_sessions.end(); ++siter) { OSDSession *s = siter->second; @@ -4372,7 +4371,6 @@ void Objecter::dump_ops(Formatter *fmt) _dump_ops(s, fmt); s->lock.unlock(); } - rwlock.unlock(); _dump_ops(homeless_session, fmt); fmt->close_section(); // ops array } @@ -4395,7 +4393,6 @@ void Objecter::_dump_linger_ops(const OSDSession *s, Formatter *fmt) void Objecter::dump_linger_ops(Formatter *fmt) { fmt->open_array_section("linger_ops"); - rwlock.get_read(); for (map::const_iterator siter = osd_sessions.begin(); siter != osd_sessions.end(); ++siter) { OSDSession *s = siter->second; @@ -4403,7 +4400,6 @@ void Objecter::dump_linger_ops(Formatter *fmt) _dump_linger_ops(s, fmt); s->lock.unlock(); } - rwlock.unlock(); _dump_linger_ops(homeless_session, fmt); fmt->close_section(); // linger_ops array } @@ -4433,7 +4429,6 @@ void Objecter::_dump_command_ops(const OSDSession *s, Formatter *fmt) void Objecter::dump_command_ops(Formatter *fmt) { fmt->open_array_section("command_ops"); - rwlock.get_read(); for (map::const_iterator siter = osd_sessions.begin(); siter != osd_sessions.end(); ++siter) { OSDSession *s = siter->second; @@ -4441,7 +4436,6 @@ void Objecter::dump_command_ops(Formatter *fmt) _dump_command_ops(s, fmt); s->lock.unlock(); } - rwlock.unlock(); _dump_command_ops(homeless_session, fmt); fmt->close_section(); // command_ops array } -- 2.47.3