From 28ee9f27b998428c937002e1ec4e44d08bbb78a6 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Mon, 4 May 2015 16:19:05 -0700 Subject: [PATCH] Add usage information for multipart_size Also improve error message. --- src/s3fs.cpp | 2 +- src/s3fs_util.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/s3fs.cpp b/src/s3fs.cpp index 53368a6..2a8f104 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -3867,7 +3867,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar if(0 == STR2NCMP(arg, "multipart_size=")){ off_t size = static_cast(s3fs_strtoofft(strchr(arg, '=') + sizeof(char))); if(!S3fsCurl::SetMultipartSize(size)){ - fprintf(stderr, "%s: multipart_size option could not be specified over 10(MB)\n", program_name.c_str()); + fprintf(stderr, "%s: multipart_size option must be at least 10 MB\n", program_name.c_str()); return -1; } if(FdManager::GetPageSize() < static_cast(S3fsCurl::GetMultipartSize() * S3fsCurl::GetMaxParallelCount())){ diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp index c1feed9..016fd36 100644 --- a/src/s3fs_util.cpp +++ b/src/s3fs_util.cpp @@ -965,6 +965,9 @@ void show_help (void) " at once. It is necessary to set this value depending on a CPU \n" " and a network band.\n" "\n" + " multipart_size (default=\"10\")\n" + " - part size, in MB, for each multipart request.\n" + "\n" " fd_page_size (default=\"52428800\"(50MB))\n" " - number of internal management page size for each file discriptor.\n" " For delayed reading and writing by s3fs, s3fs manages pages which \n"