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

smartfs procfs: fix double declare g_smartfs_operations

Browse Source
This commit is contained in:
Alexey Matveev 2024-09-09 23:07:49 +03:00 committed by Xiang Xiao
parent fbc8605b27
commit f56b7b8c06
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/procfs/fs_procfs.c
View File

@ -81,7 +81,7 @@ extern const struct procfs_operations g_mount_operations;
extern const struct procfs_operations g_net_operations; extern const struct procfs_operations g_net_operations;
extern const struct procfs_operations g_netroute_operations; extern const struct procfs_operations g_netroute_operations;
extern const struct procfs_operations g_part_operations; extern const struct procfs_operations g_part_operations;
extern const struct procfs_operations g_smartfs_operations; extern const struct procfs_operations g_smartfs_procfs_operations;
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -130,7 +130,7 @@ static const struct procfs_entry_s g_procfs_entries[] =
#endif #endif
#if defined(CONFIG_FS_SMARTFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_SMARTFS) #if defined(CONFIG_FS_SMARTFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_SMARTFS)
{ "fs/smartfs**", &g_smartfs_operations, PROCFS_UNKOWN_TYPE }, { "fs/smartfs**", &g_smartfs_procfs_operations, PROCFS_UNKOWN_TYPE },
#endif #endif
#ifndef CONFIG_FS_PROCFS_EXCLUDE_USAGE #ifndef CONFIG_FS_PROCFS_EXCLUDE_USAGE

4
fs/smartfs/smartfs_procfs.c
View File

@ -168,7 +168,7 @@ static const uint8_t g_direntrycount = sizeof(g_direntry) /
* with any compiler. * with any compiler.
*/ */
const struct procfs_operations g_smartfs_operations = const struct procfs_operations g_smartfs_procfs_operations =
{ {
smartfs_open, /* open */ smartfs_open, /* open */
smartfs_close, /* close */ smartfs_close, /* close */
@ -349,7 +349,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath,
*/ */
if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0) && if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0) &&
(g_smartfs_operations.write == NULL)) (g_smartfs_procfs_operations.write == NULL))
{ {
ferr("ERROR: Only O_RDONLY supported\n"); ferr("ERROR: Only O_RDONLY supported\n");
return -EACCES; return -EACCES;