Fix incorrect locking annotations (s3fs-fuse#2494)

Co-authored-by: Takeshi Nakatani <[email protected]>
ggtakec · Jul 11, 2024 · 6f90c69 · 6f90c69
1 parent 437bf7e
commit 6f90c69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/fdcache_auto.h b/src/fdcache_auto.h
@@ -55,7 +55,7 @@ class AutoFdEntity
       FdEntity* Attach(const char* path, int existfd);
       int GetPseudoFd() const { return pseudo_fd; }
 
-      FdEntity* Open(const char* path, const headers_t* pmeta, off_t size, const struct timespec& ts_mctime, int flags, bool force_tmpfile, bool is_create, bool ignore_modify, int* error = nullptr) REQUIRES(FdManager::fd_manager_lock);
+      FdEntity* Open(const char* path, const headers_t* pmeta, off_t size, const struct timespec& ts_mctime, int flags, bool force_tmpfile, bool is_create, bool ignore_modify, int* error = nullptr);
       FdEntity* GetExistFdEntity(const char* path, int existfd = -1);
       FdEntity* OpenExistFdEntity(const char* path, int flags = O_RDONLY);
 };

diff --git a/src/fdcache_fdinfo.h b/src/fdcache_fdinfo.h
@@ -80,7 +80,7 @@ class PseudoFdInfo
         bool OpenUploadFd() REQUIRES(upload_list_lock);
         bool ResetUploadInfo() REQUIRES(upload_list_lock);
         bool RowInitialUploadInfo(const std::string& id, bool is_cancel_mp);
-        bool CompleteInstruction(int result) REQUIRES(S3fsCurl::curl_handles_lock);
+        bool CompleteInstruction(int result) REQUIRES(upload_list_lock);
         bool ParallelMultipartUpload(const char* path, const mp_part_list_t& mplist, bool is_copy) REQUIRES(upload_list_lock);
         bool InsertUploadPart(off_t start, off_t size, int part_num, bool is_copy, etagpair** ppetag) REQUIRES(upload_list_lock);
         bool CancelAllThreads();