octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-10 23:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #993 from ggtakec/test

Browse Source 
Fixed a bug about overwrite metadata at updating directory stats
This commit is contained in:
Takeshi Nakatani 2019-03-30 01:18:48 +09:00 committed by GitHub
commit 4db6e1a10a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/s3fs.cpp
View File

@ -382,7 +382,7 @@ static int chk_dir_object_type(const char* path, string& newpath, string& nowpat
(*pType) = DIRTYPE_NOOBJ; (*pType) = DIRTYPE_NOOBJ;
nowpath = ""; nowpath = "";
}else{ }else{
nowpath = path; nowpath = newpath;
if(0 < nowpath.length() && '/' == nowpath[nowpath.length() - 1]){ if(0 < nowpath.length() && '/' == nowpath[nowpath.length() - 1]){
// "dir/" type // "dir/" type
(*pType) = DIRTYPE_NEW; (*pType) = DIRTYPE_NEW;
@ -842,6 +842,10 @@ static int put_headers(const char* path, headers_t& meta, bool is_copy)
} }
} }
// [NOTE]
// if path is 'dir/', it does not have cache(could not open file for directory stat)
//
if('/' != path[strlen(path) - 1]){
FdEntity* ent = NULL; FdEntity* ent = NULL;
if(NULL == (ent = FdManager::get()->ExistOpen(path, -1, !FdManager::IsCacheDir()))){ if(NULL == (ent = FdManager::get()->ExistOpen(path, -1, !FdManager::IsCacheDir()))){
// no opened fd // no opened fd
@ -855,6 +859,7 @@ static int put_headers(const char* path, headers_t& meta, bool is_copy)
ent->SetMtime(mtime); ent->SetMtime(mtime);
FdManager::get()->Close(ent); FdManager::get()->Close(ent);
} }
}
return 0; return 0;
} }