octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-02 18:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed to fail when the mount point directory is not existed (#2114)

Browse Source
This commit is contained in:
Takeshi Nakatani 2023-03-05 13:03:48 +09:00 committed by GitHub
parent f8a825e9b9
commit a25a9450a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/s3fs.cpp
View File

@ -3365,11 +3365,20 @@ static int remote_mountpath_exists(const char* path)
S3FS_PRN_INFO1("[path=%s]", path); S3FS_PRN_INFO1("[path=%s]", path);
// getattr will prefix the path with the remote mountpoint // getattr will prefix the path with the remote mountpoint
if(0 != (result = get_object_attribute("/", &stbuf, NULL))){ if(0 != (result = get_object_attribute(path, &stbuf, NULL))){
return result; return result;
} }
if(!S_ISDIR(stbuf.st_mode)){
return -ENOTDIR; // [NOTE]
// If "<bucket>/<directory>..." is specified as the mount point
// and the mount point(directory object) does not exist, the
// following judgment will result in an error.
// However, if there is a file object etc. under that mount
// point(directory), it will be allowed with filling the default
// stats information.
//
if(!has_mp_stat){
return -ENOENT;
} }
return 0; return 0;
} }
@ -4344,7 +4353,7 @@ static int s3fs_check_service()
// make sure remote mountpath exists and is a directory // make sure remote mountpath exists and is a directory
if(!mount_prefix.empty()){ if(!mount_prefix.empty()){
if(remote_mountpath_exists(mount_prefix.c_str()) != 0){ if(remote_mountpath_exists("/") != 0){
S3FS_PRN_CRIT("remote mountpath %s not found.", mount_prefix.c_str()); S3FS_PRN_CRIT("remote mountpath %s not found.", mount_prefix.c_str());
return EXIT_FAILURE; return EXIT_FAILURE;
} }