sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/littlefs/lfs_vfs.c: Fix typographical errors in the VFS wrapper.

Browse Source
This commit is contained in:
Xiang Xiao 2019-01-29 07:39:25 -06:00 committed by Gregory Nutt
parent 2f49cdb311
commit b9c55919b2
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/littlefs/lfs_vfs.c
View File

@ -63,6 +63,7 @@
#include <sys/statfs.h> #include <sys/statfs.h>
#include "lfs.h" #include "lfs.h"
#include "lfs_util.h"
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -78,7 +79,7 @@ struct littlefs_mountpt_s
sem_t sem; sem_t sem;
FAR struct inode *drv; FAR struct inode *drv;
struct mtd_geometry_s geo; struct mtd_geometry_s geo;
struct lfs_config cfg; struct lfs_config_s cfg;
lfs_t lfs; lfs_t lfs;
}; };
@ -262,7 +263,7 @@ static int littlefs_open(FAR struct file *filep, FAR const char *relpath,
int oflags, mode_t mode) int oflags, mode_t mode)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
int ret; int ret;
@ -335,7 +336,7 @@ errout:
static int littlefs_close(FAR struct file *filep) static int littlefs_close(FAR struct file *filep)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
/* Recover our private data from the struct file instance */ /* Recover our private data from the struct file instance */
@ -364,7 +365,7 @@ static ssize_t littlefs_read(FAR struct file *filep, FAR char *buffer,
size_t buflen) size_t buflen)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
ssize_t ret; ssize_t ret;
@ -395,7 +396,7 @@ static ssize_t littlefs_write(FAR struct file *filep, const char *buffer,
size_t buflen) size_t buflen)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
ssize_t ret; ssize_t ret;
@ -425,7 +426,7 @@ static ssize_t littlefs_write(FAR struct file *filep, const char *buffer,
static off_t littlefs_seek(FAR struct file *filep, off_t offset, int whence) static off_t littlefs_seek(FAR struct file *filep, off_t offset, int whence)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
off_t ret; off_t ret;
@ -485,7 +486,7 @@ static int littlefs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
static int littlefs_sync(FAR struct file *filep) static int littlefs_sync(FAR struct file *filep)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
int ret; int ret;
@ -526,7 +527,7 @@ static int littlefs_dup(FAR const struct file *oldp, FAR struct file *newp)
static int littlefs_fstat(FAR const struct file *filep, FAR struct stat *buf) static int littlefs_fstat(FAR const struct file *filep, FAR struct stat *buf)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));
@ -567,7 +568,7 @@ static int littlefs_fstat(FAR const struct file *filep, FAR struct stat *buf)
static int littlefs_truncate(FAR struct file *filep, off_t length) static int littlefs_truncate(FAR struct file *filep, off_t length)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_file *priv; FAR struct lfs_file_s *priv;
FAR struct inode *inode; FAR struct inode *inode;
int ret; int ret;
@ -598,7 +599,7 @@ static int littlefs_opendir(FAR struct inode *mountpt,
FAR struct fs_dirent_s *dir) FAR struct fs_dirent_s *dir)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_dir *priv; FAR struct lfs_dir_s *priv;
int ret; int ret;
/* Recover our private data from the inode instance */ /* Recover our private data from the inode instance */
@ -648,7 +649,7 @@ static int littlefs_closedir(FAR struct inode *mountpt,
FAR struct fs_dirent_s *dir) FAR struct fs_dirent_s *dir)
{ {
struct littlefs_mountpt_s *fs; struct littlefs_mountpt_s *fs;
FAR struct lfs_dir *priv; FAR struct lfs_dir_s *priv;
/* Recover our private data from the inode instance */ /* Recover our private data from the inode instance */
@ -676,8 +677,8 @@ static int littlefs_readdir(FAR struct inode *mountpt,
FAR struct fs_dirent_s *dir) FAR struct fs_dirent_s *dir)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
FAR struct lfs_dir *priv; FAR struct lfs_dir_s *priv;
struct lfs_info info; struct lfs_info_s info;
int ret; int ret;
/* Recover our private data from the inode instance */ /* Recover our private data from the inode instance */
@ -724,7 +725,7 @@ static int littlefs_rewinddir(FAR struct inode *mountpt,
FAR struct fs_dirent_s *dir) FAR struct fs_dirent_s *dir)
{ {
struct littlefs_mountpt_s *fs; struct littlefs_mountpt_s *fs;
FAR struct lfs_dir *priv; FAR struct lfs_dir_s *priv;
int ret; int ret;
/* Recover our private data from the inode instance */ /* Recover our private data from the inode instance */
@ -757,8 +758,9 @@ static int littlefs_rewinddir(FAR struct inode *mountpt,
* *
****************************************************************************/ ****************************************************************************/
static int littlefs_read_block(const struct lfs_config *c, lfs_block_t block, static int littlefs_read_block(FAR const struct lfs_config_s *c,
lfs_off_t off, void *buffer, lfs_size_t size) lfs_block_t block, lfs_off_t off,
FAR void *buffer, lfs_size_t size)
{ {
FAR struct littlefs_mountpt_s *fs = c->context; FAR struct littlefs_mountpt_s *fs = c->context;
FAR struct mtd_geometry_s *geo = &fs->geo; FAR struct mtd_geometry_s *geo = &fs->geo;
@ -784,9 +786,9 @@ static int littlefs_read_block(const struct lfs_config *c, lfs_block_t block,
* Name: littlefs_write_block * Name: littlefs_write_block
****************************************************************************/ ****************************************************************************/
static int littlefs_write_block(const struct lfs_config *c, lfs_block_t block, static int littlefs_write_block(FAR const struct lfs_config_s *c,
lfs_off_t off, const void *buffer, lfs_block_t block, lfs_off_t off,
lfs_size_t size) FAR const void *buffer, lfs_size_t size)
{ {
FAR struct littlefs_mountpt_s *fs = c->context; FAR struct littlefs_mountpt_s *fs = c->context;
FAR struct mtd_geometry_s *geo = &fs->geo; FAR struct mtd_geometry_s *geo = &fs->geo;
@ -812,7 +814,8 @@ static int littlefs_write_block(const struct lfs_config *c, lfs_block_t block,
* Name: littlefs_erase_block * Name: littlefs_erase_block
****************************************************************************/ ****************************************************************************/
static int littlefs_erase_block(const struct lfs_config *c, lfs_block_t block) static int littlefs_erase_block(FAR const struct lfs_config_s *c,
lfs_block_t block)
{ {
FAR struct littlefs_mountpt_s *fs = c->context; FAR struct littlefs_mountpt_s *fs = c->context;
FAR struct inode *drv = fs->drv; FAR struct inode *drv = fs->drv;
@ -834,7 +837,7 @@ static int littlefs_erase_block(const struct lfs_config *c, lfs_block_t block)
* Name: littlefs_sync_block * Name: littlefs_sync_block
****************************************************************************/ ****************************************************************************/
static int littlefs_sync_block(const struct lfs_config *c) static int littlefs_sync_block(FAR const struct lfs_config_s *c)
{ {
FAR struct littlefs_mountpt_s *fs = c->context; FAR struct littlefs_mountpt_s *fs = c->context;
FAR struct inode *drv = fs->drv; FAR struct inode *drv = fs->drv;
@ -1084,7 +1087,7 @@ static int littlefs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
/* Return something for the file system description */ /* Return something for the file system description */
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));
buf->f_type = LITTLEFS_MAGIC; buf->f_type = LITTLEFS_SUPER_MAGIC;
buf->f_namelen = LFS_NAME_MAX; buf->f_namelen = LFS_NAME_MAX;
buf->f_bsize = fs->cfg.block_size; buf->f_bsize = fs->cfg.block_size;
buf->f_blocks = fs->cfg.block_count; buf->f_blocks = fs->cfg.block_count;
@ -1200,7 +1203,7 @@ static int littlefs_stat(FAR struct inode *mountpt, FAR const char *relpath,
FAR struct stat *buf) FAR struct stat *buf)
{ {
FAR struct littlefs_mountpt_s *fs; FAR struct littlefs_mountpt_s *fs;
struct lfs_info info; struct lfs_info_s info;
int ret; int ret;
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));