diff options
| author | Meco Jianting Man <[email protected]> | 2021-06-05 13:03:45 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-05 13:03:45 +0800 |
| commit | bfd8d21e388befc5d971075db5af0ed561abb4f2 (patch) | |
| tree | d5caabadeb30fc67b3e0efa6dad251617639e096 /components/dfs | |
| parent | 02331fd30d1f1ca8c886aac4db6c8c111987913c (diff) | |
| parent | 28847008171ab7423b6b05b7157d3467f1525fda (diff) | |
Merge branch 'master' into mutexrevert
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/Kconfig | 6 | ||||
| -rw-r--r-- | components/dfs/filesystems/devfs/devfs.c | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig index 39eca3c507..442c3bb260 100644 --- a/components/dfs/Kconfig +++ b/components/dfs/Kconfig @@ -14,13 +14,11 @@ if RT_USING_DFS config DFS_FILESYSTEMS_MAX int "The maximal number of mounted file system" - default 4 if RT_USING_DFS_NFS - default 2 + default 4 config DFS_FILESYSTEM_TYPES_MAX int "The maximal number of file system type" - default 4 if RT_USING_DFS_NFS - default 2 + default 4 config DFS_FD_MAX int "The maximal number of opened files" diff --git a/components/dfs/filesystems/devfs/devfs.c b/components/dfs/filesystems/devfs/devfs.c index 2e2248d5cc..d615482452 100644 --- a/components/dfs/filesystems/devfs/devfs.c +++ b/components/dfs/filesystems/devfs/devfs.c @@ -313,15 +313,13 @@ static const struct dfs_filesystem_ops _device_fs = "devfs", DFS_FS_FLAG_DEFAULT, &_device_fops, - dfs_device_fs_mount, - RT_NULL, - RT_NULL, - RT_NULL, - - RT_NULL, + RT_NULL, /*unmount*/ + RT_NULL, /*mkfs*/ + RT_NULL, /*statfs*/ + RT_NULL, /*unlink*/ dfs_device_fs_stat, - RT_NULL, + RT_NULL, /*rename*/ }; int devfs_init(void) |