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

Merge pull request #466 from ggtakec/master

Browse Source 
Fixed a bug about could not copy file mode from org file
This commit is contained in:
Takeshi Nakatani 2016-09-11 23:11:22 +09:00 committed by GitHub
commit a56fe0ea28
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/s3fs.cpp
View File

@ -1561,6 +1561,17 @@ static int s3fs_chmod(const char* path, mode_t mode)
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
// check opened file handle.
//
// If we have already opened file handle, should set mode to it.
// And new mode is set when the file handle is closed.
//
FdEntity* ent;
if(NULL != (ent = FdManager::get()->ExistOpen(path))){
ent->SetMode(mode); // Set new mode to opened fd.
FdManager::get()->Close(ent);
}
} }
S3FS_MALLOCTRIM(0); S3FS_MALLOCTRIM(0);

7
test/integration-test-main.sh
View File

@ -207,9 +207,14 @@ function test_chown {
# if they're the same, we have a problem. # if they're the same, we have a problem.
if [ $(stat --format=%u:%g $TEST_TEXT_FILE) == $ORIGINAL_PERMISSIONS ] if [ $(stat --format=%u:%g $TEST_TEXT_FILE) == $ORIGINAL_PERMISSIONS ]
then then
echo "Could not modify $TEST_TEXT_FILE ownership" if [ $ORIGINAL_PERMISSIONS == "1000:1000" ]
then
echo "Could not be strict check because original file permission 1000:1000"
else
echo "Could not modify $TEST_TEXT_FILE ownership($ORIGINAL_PERMISSIONS to 1000:1000)"
return 1 return 1
fi fi
fi
# clean up # clean up
rm_test_file rm_test_file