Merge pull request #29147 from pdvian/wip-40267-nautilus

nautilus: common: OutputDataSocket retakes mutex on error path Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Jul 30, 2019 · 655ba2c · 655ba2c
2 parents 5a60c42 + 43e3920
commit 655ba2c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc
@@ -304,6 +304,7 @@ int OutputDataSocket::dump_data(int fd)
       ret = safe_write(fd, delim.c_str(), delim.length());
     }
     if (ret < 0) {
+      std::scoped_lock lock(m_lock);
       for (; iter != l.end(); ++iter) {
         bufferlist& bl = *iter;
 	data.push_back(bl);