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

Force flush in s3fs_open() if file is truncated.

Browse Source
This commit is contained in:
Robb Kistler 2015-11-03 22:04:16 -08:00
parent a3ef5c820d
commit dd7d9268f2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/s3fs.cpp
View File

@ -2002,6 +2002,7 @@ static int s3fs_open(const char* path, struct fuse_file_info* fi)
{ {
int result; int result;
struct stat st; struct stat st;
bool needs_flush = false;
S3FS_PRN_INFO("[path=%s][flags=%d]", path, fi->flags); S3FS_PRN_INFO("[path=%s][flags=%d]", path, fi->flags);
@ -2026,6 +2027,7 @@ static int s3fs_open(const char* path, struct fuse_file_info* fi)
if((unsigned int)fi->flags & O_TRUNC){ if((unsigned int)fi->flags & O_TRUNC){
st.st_size = 0; st.st_size = 0;
needs_flush = true;
} }
if(!S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)){ if(!S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)){
st.st_mtime = -1; st.st_mtime = -1;
@ -2037,6 +2039,15 @@ static int s3fs_open(const char* path, struct fuse_file_info* fi)
if(NULL == (ent = FdManager::get()->Open(path, &meta, static_cast<ssize_t>(st.st_size), st.st_mtime, false, true))){ if(NULL == (ent = FdManager::get()->Open(path, &meta, static_cast<ssize_t>(st.st_size), st.st_mtime, false, true))){
return -EIO; return -EIO;
} }
if (needs_flush){
if(0 != (result = ent->RowFlush(path, true))){
S3FS_PRN_ERR("could not upload file(%s): result=%d", path, result);
FdManager::get()->Close(ent);
return result;
}
}
fi->fh = ent->GetFd(); fi->fh = ent->GetFd();
S3FS_MALLOCTRIM(0); S3FS_MALLOCTRIM(0);