yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!934 fix: 对外提供CONFIG_NFILE_DESCRIPTORS宏表示最大可打开fd数量 

Merge pull request !934 from Hongjin Li/fs1
This commit is contained in:
openharmony_ci 2022-12-06 12:10:31 +00:00 committed by Gitee
parent 9cbddd412d a3ce436841
commit c7da881469
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/fs/vfs/vfs_config.h
View File

@ -49,19 +49,15 @@
#ifdef LOSCFG_FS_FAT #ifdef LOSCFG_FS_FAT
#include "fatfs_conf.h" #include "fatfs_conf.h"
#define __FAT_NFILE FAT_MAX_OPEN_FILES
#else
#define __FAT_NFILE 0
#endif #endif
#ifdef LOSCFG_FS_LITTLEFS #ifdef LOSCFG_FS_LITTLEFS
#include "lfs_conf.h" #include "lfs_conf.h"
#define __LFS_NFILE LOSCFG_LFS_MAX_OPEN_FILES
#else
#define __LFS_NFILE 0
#endif #endif
#define CONFIG_NFILE_DESCRIPTORS (__FAT_NFILE + __LFS_NFILE) #ifndef CONFIG_NFILE_DESCRIPTORS
#define CONFIG_NFILE_DESCRIPTORS 256
#endif
#define NR_OPEN_DEFAULT CONFIG_NFILE_DESCRIPTORS #define NR_OPEN_DEFAULT CONFIG_NFILE_DESCRIPTORS

4
components/fs/vfs/vfs_fs.c
View File

@ -57,10 +57,6 @@
#define CONFIG_NSOCKET_DESCRIPTORS 0 #define CONFIG_NSOCKET_DESCRIPTORS 0
#endif #endif
#ifndef CONFIG_NFILE_DESCRIPTORS
#define CONFIG_NFILE_DESCRIPTORS 256
#endif
#ifdef LOSCFG_RANDOM_DEV #ifdef LOSCFG_RANDOM_DEV
#include "hks_client.h" #include "hks_client.h"
#define RANDOM_DEV_FD CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS #define RANDOM_DEV_FD CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS