lib: chunkio: upgrade to v1.1.3 (#4148)

This patch upgrade Chunk I/O to version v1.1.3, some of the changes are: - Fix wrong value of zero on fs_size file structure. - Use posix_fallocate() if fallocate() is not available (address ext3 and reiser fs) - Minor fixes Signed-off-by: Eduardo Silva <[email protected]>
fluent · Oct 5, 2021 · 1314fff · 1314fff
1 parent 3d6cfc0
commit 1314fff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
@@ -3,7 +3,7 @@ project(chunk-io)
 
 set(CIO_VERSION_MAJOR 1)
 set(CIO_VERSION_MINOR 1)
-set(CIO_VERSION_PATCH 1)
+set(CIO_VERSION_PATCH 3)
 set(CIO_VERSION_STR "${CIO_VERSION_MAJOR}.${CIO_VERSION_MINOR}.${CIO_VERSION_PATCH}")
 
 # CFLAGS

diff --git a/lib/chunkio/src/cio_file.c b/lib/chunkio/src/cio_file.c
@@ -528,6 +528,7 @@ struct cio_file *cio_file_open(struct cio_ctx *ctx,
  int ret;
  int len;
  char *path;
+ struct stat f_st;
  struct cio_file *cf;
 
  len = strlen(ch->name);
@@ -574,6 +575,12 @@ struct cio_file *cio_file_open(struct cio_ctx *ctx,
  /* Should we open and put this file up ? */
  ret = open_and_up(ctx);
  if (ret == CIO_FALSE) {
+ /* make sure to set the file size before to return */
+ ret = stat(cf->path, &f_st);
+ if (ret == 0) {
+ cf->fs_size = f_st.st_size;
+ }
+
  /* we reached our limit, let the file 'down' */
  return cf;
  }
@@ -1056,6 +1063,13 @@ int cio_file_fs_size_change(struct cio_file *cf, size_t new_size)
  * fallocate() is not portable, Linux only.
  */
  ret = fallocate(cf->fd, 0, 0, new_size);
+ if (ret == EOPNOTSUPP) {
+ /* If fallocate fails with an EOPNOTSUPP try operation using
+ * posix_fallocate. Required since some filesystems do not support
+ * the fallocate operation e.g. ext3 and reiserfs.
+ */
+ ret = posix_fallocate(cf->fd, 0, new_size);
+ }
  }
  else
 #endif

diff --git a/lib/chunkio/src/cio_stream.c b/lib/chunkio/src/cio_stream.c
@@ -216,7 +216,7 @@ int cio_stream_delete(struct cio_stream *st)
  if (!path) {
  cio_log_error(ctx,
  "content from stream '%s' has been deleted, but the "
- "directory might still exists.");
+ "directory might still exists.", path);
  return -1;
  }