Mirrors_Framework/rtems
1
0 Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-11-09 08:37:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

JFFS2: Add RTEMS_JFFS2_GET_INFO

Browse Source 
Add IO control RTEMS_JFFS2_GET_INFO to get some JFFS2 filesystem
instance information.

Update #2844.
This commit is contained in:
Sebastian Huber committed 2016-12-20 08:26:21 +01:00
1 parent 4aba8d7986
commit 07c833f8f9
8 files changed
+470 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpukit/libfs/src/jffs2/include/rtems/jffs2.h
+101 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 embedded brains GmbH. All rights reserved.
* Copyright (c) 2013, 2016 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -17,6 +17,7 @@
#include <rtems/fs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
#include <zlib.h>
#ifdef __cplusplus
@@ -455,6 +456,105 @@ int rtems_jffs2_initialize(
const void *data
);
/**
* @brief JFFS2 filesystem instance information.
*
* @see RTEMS_JFFS2_GET_INFO.
*/
typedef struct {
/**
* @brief Flash size in bytes.
*/
uint32_t flash_size;
/**
* @brief Count of flash blocks (eraseable units).
*/
uint32_t flash_blocks;
/**
* @brief Size of a flash block in bytes.
*/
uint32_t flash_block_size;
/**
* @brief Used size in bytes.
*
* Used areas contain valid data.
*/
uint32_t used_size;
/**
* @brief Dirty size in bytes.
*
* Used areas contain no longer used data.
*/
uint32_t dirty_size;
/**
* @brief Wasted size in bytes.
*
* Wasted areas are unusable.
*/
uint32_t wasted_size;
/**
* @brief Free size in bytes.
*
* Free areas may be used to store new data.
*/
uint32_t free_size;
/**
* @brief Bad size in bytes.
*
* Bad areas indicate damaged flash blocks.
*/
uint32_t bad_size;
/**
* @brief Count of clean blocks.
*
* Clean blocks contain only used areas.
*/
uint32_t clean_blocks;
/**
* @brief Count of dirty blocks.
*
* Dirty blocks contain dirty and used areas.
*/
uint32_t dirty_blocks;
/**
* @brief Count of erasable blocks.
*
* Erase blocks contain only dirty or wasted areas.
*/
uint32_t erasable_blocks;
/**
* @brief Count of free blocks.
*
* Free blocks contain a free area.
*/
uint32_t free_blocks;
/**
* @brief Count of bad blocks.
*
* Bad blocks are damaged.
*/
uint32_t bad_blocks;
} rtems_jffs2_info;
/**
* @brief IO control to get the JFFS2 filesystem instance information.
*
* @see rtems_jffs2_info.
*/
#define RTEMS_JFFS2_GET_INFO _IOR('F', 1, rtems_jffs2_info)
/** @} */
#ifdef __cplusplus
cpukit/libfs/src/jffs2/src/fs-rtems.c
+70 -4
View File
@@ -4,7 +4,7 @@
* Copyright © 2001-2003 Free Software Foundation, Inc.
* Copyright © 2001-2007 Red Hat, Inc.
* Copyright © 2004-2010 David Woodhouse <dwmw2@infradead.org>
* Copyright © 2013 embedded brains GmbH <rtems@embedded-brains.de>
* Copyright © 2013, 2016 embedded brains GmbH <rtems@embedded-brains.de>
*
* Created by Dominic Ostrowski <dominic.ostrowski@3glab.com>
* Contributors: David Woodhouse, Nick Garnett, Richard Panton.
@@ -512,12 +512,78 @@ static ssize_t rtems_jffs2_dir_read(rtems_libio_t *iop, void *buf, size_t len)
}
}
static uint32_t rtems_jffs2_count_blocks(const struct list_head *list)
{
uint32_t count = 0;
struct jffs2_eraseblock *jeb;
list_for_each_entry(jeb, list, list) {
++count;
}
return count;
}
static void rtems_jffs2_get_info(
const struct jffs2_sb_info *c,
rtems_jffs2_info *info
)
{
info->flash_size = c->flash_size;
info->flash_blocks = c->nr_blocks;
info->flash_block_size = c->sector_size;
info->used_size = c->used_size;
info->dirty_size = c->dirty_size;
info->wasted_size = c->wasted_size;
info->free_size = c->free_size;
info->bad_size = c->bad_size;
info->clean_blocks = rtems_jffs2_count_blocks(&c->clean_list);
info->dirty_blocks = rtems_jffs2_count_blocks(&c->very_dirty_list)
+ rtems_jffs2_count_blocks(&c->dirty_list);
info->dirty_blocks += c->gcblock != NULL;
info->erasable_blocks = rtems_jffs2_count_blocks(&c->erasable_list)
+ rtems_jffs2_count_blocks(&c->erasable_pending_wbuf_list)
+ rtems_jffs2_count_blocks(&c->erasing_list)
+ rtems_jffs2_count_blocks(&c->erase_checking_list)
+ rtems_jffs2_count_blocks(&c->erase_pending_list)
+ rtems_jffs2_count_blocks(&c->erase_complete_list);
info->free_blocks = rtems_jffs2_count_blocks(&c->free_list);
info->free_blocks += c->nextblock != NULL;
info->bad_blocks = rtems_jffs2_count_blocks(&c->bad_list);
}
static int rtems_jffs2_ioctl(
rtems_libio_t *iop,
ioctl_command_t request,
void *buffer
)
{
struct _inode *inode = rtems_jffs2_get_inode_by_iop(iop);
int eno;
rtems_jffs2_do_lock(inode->i_sb);
switch (request) {
case RTEMS_JFFS2_GET_INFO:
rtems_jffs2_get_info(&inode->i_sb->jffs2_sb, buffer);
eno = 0;
break;
default:
eno = EINVAL;
break;
}
rtems_jffs2_do_unlock(inode->i_sb);
return rtems_jffs2_eno_to_rv_and_errno(eno);
}
static const rtems_filesystem_file_handlers_r rtems_jffs2_directory_handlers = {
.open_h = rtems_filesystem_default_open,
.close_h = rtems_filesystem_default_close,
.read_h = rtems_jffs2_dir_read,
.write_h = rtems_filesystem_default_write,
.ioctl_h = rtems_filesystem_default_ioctl,
.ioctl_h = rtems_jffs2_ioctl,
.lseek_h = rtems_filesystem_default_lseek_directory,
.fstat_h = rtems_jffs2_fstat,
.ftruncate_h = rtems_filesystem_default_ftruncate_directory,
@@ -659,7 +725,7 @@ static const rtems_filesystem_file_handlers_r rtems_jffs2_file_handlers = {
.close_h = rtems_filesystem_default_close,
.read_h = rtems_jffs2_file_read,
.write_h = rtems_jffs2_file_write,
.ioctl_h = rtems_filesystem_default_ioctl,
.ioctl_h = rtems_jffs2_ioctl,
.lseek_h = rtems_filesystem_default_lseek_file,
.fstat_h = rtems_jffs2_fstat,
.ftruncate_h = rtems_jffs2_file_ftruncate,
@@ -677,7 +743,7 @@ static const rtems_filesystem_file_handlers_r rtems_jffs2_link_handlers = {
.close_h = rtems_filesystem_default_close,
.read_h = rtems_filesystem_default_read,
.write_h = rtems_filesystem_default_write,
.ioctl_h = rtems_filesystem_default_ioctl,
.ioctl_h = rtems_jffs2_ioctl,
.lseek_h = rtems_filesystem_default_lseek,
.fstat_h = rtems_jffs2_fstat,
.ftruncate_h = rtems_filesystem_default_ftruncate,
testsuites/fstests/Makefile.am
+1
View File
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I ../aclocal
_SUBDIRS =
_SUBDIRS += fsjffs2gc01
_SUBDIRS += fsimfsconfig03
_SUBDIRS += fsimfsconfig02
_SUBDIRS += fsimfsconfig01
testsuites/fstests/configure.ac
+1
View File
@@ -77,6 +77,7 @@ AC_CHECK_SIZEOF([blkcnt_t])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
fsjffs2gc01/Makefile
fsimfsconfig03/Makefile
fsimfsconfig02/Makefile
fsimfsconfig01/Makefile
testsuites/fstests/fsjffs2gc01/Makefile.am
+29
View File
@@ -0,0 +1,29 @@
rtems_tests_PROGRAMS = fsjffs2gc01
fsjffs2gc01_SOURCES = init.c
fsjffs2gc01_SOURCES += ../support/fstest_support.c
fsjffs2gc01_SOURCES += ../support/fstest_support.h
fsjffs2gc01_SOURCES += ../support/fstest.h
fsjffs2gc01_SOURCES += ../../psxtests/include/pmacros.h
fsjffs2gc01_SOURCES += ../jffs2_support/fs_support.c
fsjffs2gc01_SOURCES += ../jffs2_support/fs_config.h
fsjffs2gc01_LDADD = -ljffs2
dist_rtems_tests_DATA = fsjffs2gc01.scn fsjffs2gc01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/support
AM_CPPFLAGS += -I$(top_srcdir)/jffs2_support
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
LINK_OBJS = $(fsjffs2gc01_OBJECTS) $(fsjffs2gc01_LDADD)
LINK_LIBS = $(fsjffs2gc01_LDLIBS)
fsjffs2gc01$(EXEEXT): $(fsjffs2gc01_OBJECTS) $(fsjffs2gc01_DEPENDENCIES)
@rm -f fsjffs2gc01$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
testsuites/fstests/fsjffs2gc01/fsjffs2gc01.doc
+11
View File
@@ -0,0 +1,11 @@
This file describes the directives and concepts tested by this test set.
test set name: fsjffs2gc01
directives:
- JFFS2 implementation
concepts:
- Ensure that RTEMS_JFFS2_GET_INFO returns the expected information.
testsuites/fstests/fsjffs2gc01/fsjffs2gc01.scn
+6
View File
@@ -0,0 +1,6 @@
*** BEGIN OF TEST FSJFFS2GC 1 ***
Initializing filesystem JFFS2
Shutting down filesystem JFFS2
*** END OF TEST FSJFFS2GC 1 ***
testsuites/fstests/fsjffs2gc01/init.c
+251
View File
File diff suppressed because it is too large. Load diff