libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1624 from armink/fix_dfs 

Update DFS fd_max and errror log
This commit is contained in:
Bernard Xiong 2018-07-14 12:19:30 +08:00 committed by GitHub
parent 1758f5773e 6139e6a3cc
commit bb5c3da74f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/dfs/Kconfig
View File

@ -24,8 +24,7 @@ if RT_USING_DFS
config DFS_FD_MAX config DFS_FD_MAX
int "The maximal number of opened files" int "The maximal number of opened files"
default 16 if RT_USING_DFS_NFS default 16
default 4
config RT_USING_DFS_ELMFAT config RT_USING_DFS_ELMFAT
bool "Enable elm-chan fatfs" bool "Enable elm-chan fatfs"

1
components/dfs/src/dfs.c
View File

@ -197,6 +197,7 @@ int fd_new(void)
if (idx == fdt->maxfd) if (idx == fdt->maxfd)
{ {
idx = -(1 + DFS_FD_OFFSET); idx = -(1 + DFS_FD_OFFSET);
dbg_log(DBG_ERROR, "DFS fd new is failed! Could not found an empty fd entry.");
goto __result; goto __result;
} }

7
components/dfs/src/dfs_fs.c
View File

@ -69,6 +69,7 @@ int dfs_register(const struct dfs_filesystem_ops *ops)
if (empty == NULL) if (empty == NULL)
{ {
rt_set_errno(-ENOSPC); rt_set_errno(-ENOSPC);
dbg_log(DBG_ERROR, "There is no space to register this file system (%d).\n", ops->name);
ret = -1; ret = -1;
} }
else if (ret == RT_EOK) else if (ret == RT_EOK)
@ -317,6 +318,7 @@ int dfs_mount(const char *device_name,
if ((fs == NULL) && (iter == &filesystem_table[DFS_FILESYSTEMS_MAX])) if ((fs == NULL) && (iter == &filesystem_table[DFS_FILESYSTEMS_MAX]))
{ {
rt_set_errno(-ENOSPC); rt_set_errno(-ENOSPC);
dbg_log(DBG_ERROR, "There is no space to mount this file system (%s).\n", filesystemtype);
goto err1; goto err1;
} }
@ -449,6 +451,7 @@ int dfs_mkfs(const char *fs_name, const char *device_name)
if (dev_id == NULL) if (dev_id == NULL)
{ {
rt_set_errno(-ENODEV); rt_set_errno(-ENODEV);
dbg_log(DBG_ERROR, "Device (%s) was not found\n", device_name);
return -1; return -1;
} }
@ -469,6 +472,7 @@ int dfs_mkfs(const char *fs_name, const char *device_name)
const struct dfs_filesystem_ops *ops = filesystem_operation_table[index]; const struct dfs_filesystem_ops *ops = filesystem_operation_table[index];
if (ops->mkfs == NULL) if (ops->mkfs == NULL)
{ {
dbg_log(DBG_ERROR, "The file system (%s) mkfs function was not implement\n", fs_name);
rt_set_errno(-ENOSYS); rt_set_errno(-ENOSYS);
return -1; return -1;
} }
@ -476,7 +480,8 @@ int dfs_mkfs(const char *fs_name, const char *device_name)
return ops->mkfs(dev_id); return ops->mkfs(dev_id);
} }
rt_kprintf("Can not find the file system which named as %s.\n", fs_name); dbg_log(DBG_ERROR, "File system (%s) was not found.\n", fs_name);
return -1; return -1;
} }