Merge pull request #1107 from gaul/concurrency

Access FdEntity metadata while holding fdent_lock
s3fs-fuse · Aug 3, 2019 · 6837cbf · 6837cbf
2 parents 80972aa + afd438d
commit 6837cbf
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/fdcache.cpp b/src/fdcache.cpp
@@ -1479,7 +1479,15 @@ int FdEntity::RowFlush(const char* tpath, bool force_sync)
 {
   int result = 0;
 
-  S3FS_PRN_INFO3("[tpath=%s][path=%s][fd=%d]", SAFESTRPTR(tpath), path.c_str(), fd);
+  std::string tmppath;
+  headers_t tmporgmeta;
+  {
+    AutoLock auto_lock(&fdent_lock);
+    tmppath = path;
+    tmporgmeta = orgmeta;
+  }
+
+  S3FS_PRN_INFO3("[tpath=%s][path=%s][fd=%d]", SAFESTRPTR(tpath), tmppath.c_str(), fd);
 
   if(-1 == fd){
     return -EBADF;
@@ -1554,10 +1562,10 @@ int FdEntity::RowFlush(const char* tpath, bool force_sync)
     }
 
     if(pagelist.Size() >= S3fsCurl::GetMultipartSize() && !nomultipart){
-      result = S3fsCurl::ParallelMultipartUploadRequest(tpath ? tpath : path.c_str(), orgmeta, fd);
+      result = S3fsCurl::ParallelMultipartUploadRequest(tpath ? tpath : tmppath.c_str(), tmporgmeta, fd);
     }else{
       S3fsCurl s3fscurl(true);
-      result = s3fscurl.PutRequest(tpath ? tpath : path.c_str(), orgmeta, fd);
+      result = s3fscurl.PutRequest(tpath ? tpath : tmppath.c_str(), tmporgmeta, fd);
     }
 
     // seek to head of file.