]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
common: OutputDataSocket retakes mutex on error path 29201/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 6 Jun 2019 13:48:42 +0000 (09:48 -0400)
committerNathan Cutler <ncutler@suse.com>
Tue, 23 Jul 2019 13:01:10 +0000 (15:01 +0200)
commit8fc9073e2a280132122c06fd1210e5b76deaa38c
treee1fdedee74cba25af97ee59a5817247f2356f09c
parentc1cd465c4f7a185c193fc8999a74b9ff428ac254
common: OutputDataSocket retakes mutex on error path

the list of buffers is protected by mutex m_lock. when dump_data() fails
and puts unwritten buffers back into the list, it needs to reaquire the
lock

Fixes: http://tracker.ceph.com/issues/40188
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8645e24dd4fb3ecc9f02b34a1be916620b5f71b1)

Conflicts:
    src/common/OutputDataSocket.cc
- use Mutex::Locker instead of std::scoped_lock
src/common/OutputDataSocket.cc