From a3e9ae5d0d0be4eb8b3b1abd44c6d83a2936f7f5 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 16 Sep 2016 13:54:18 +0200 Subject: imfs: Fix IMFS_stat_file() Use the adjusted and not the requested memfile bytes per block. Untangle dependencies. --- cpukit/libfs/src/imfs/imfs_initsupp.c | 5 ----- cpukit/libfs/src/imfs/imfs_stat_file.c | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cpukit/libfs/src/imfs/imfs_initsupp.c b/cpukit/libfs/src/imfs/imfs_initsupp.c index 5528e1899b..83018313e2 100644 --- a/cpukit/libfs/src/imfs/imfs_initsupp.c +++ b/cpukit/libfs/src/imfs/imfs_initsupp.c @@ -25,11 +25,6 @@ #include #include -/* - * IMFS_determine_bytes_per_block - */ -int imfs_memfile_bytes_per_block = 0; - static int IMFS_determine_bytes_per_block( int *dest_bytes_per_block, int requested_bytes_per_block, diff --git a/cpukit/libfs/src/imfs/imfs_stat_file.c b/cpukit/libfs/src/imfs/imfs_stat_file.c index 2302705b2c..9377b25524 100644 --- a/cpukit/libfs/src/imfs/imfs_stat_file.c +++ b/cpukit/libfs/src/imfs/imfs_stat_file.c @@ -19,6 +19,8 @@ #include "imfs.h" +int imfs_memfile_bytes_per_block; + int IMFS_stat_file( const rtems_filesystem_location_info_t *loc, struct stat *buf @@ -27,7 +29,7 @@ int IMFS_stat_file( const IMFS_file_t *file = loc->node_access; buf->st_size = file->File.size; - buf->st_blksize = imfs_rq_memfile_bytes_per_block; + buf->st_blksize = imfs_memfile_bytes_per_block; return IMFS_stat( loc, buf ); } -- cgit v1.2.3