You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/06/17 11:31:23 UTC
[nuttx] branch master updated (514e77b75e -> 7117d3ea8a)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 514e77b75e semaphore: Optimize priority inheritance with only one holder
new 279667a8f5 fs_romfs: avoid the romfs ERROR log when enable FDSAN
new 7117d3ea8a fs_fsync: should not call fs's ioctl when fs not support sync api
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fs/romfs/fs_romfs.c | 1 -
fs/vfs/fs_fsync.c | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
[nuttx] 01/02: fs_romfs: avoid the romfs ERROR log when enable FDSAN
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 279667a8f5a101595a6e0bee6b9d3f320f2d6380
Author: wangbowen6 <wa...@xiaomi.com>
AuthorDate: Wed Jun 7 13:05:24 2023 +0800
fs_romfs: avoid the romfs ERROR log when enable FDSAN
Error log:
[ 0.003400] [remote] romfs_ioctl: ERROR: Invalid cmd: 783
[ 0.003400] [remote] romfs_ioctl: ERROR: Invalid cmd: 782
[ 0.003500] [remote] romfs_ioctl: ERROR: Invalid cmd: 783
[ 0.003600] [remote] romfs_ioctl: ERROR: Invalid cmd: 782
[ 0.042900] [remote] romfs_ioctl: ERROR: Invalid cmd: 783
[ 0.043100] [remote] romfs_ioctl: ERROR: Invalid cmd: 782
Signed-off-by: wangbowen6 <wa...@xiaomi.com>
---
fs/romfs/fs_romfs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index bd1bc2f03a..2ba2e69c3f 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -604,7 +604,6 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
return OK;
}
- ferr("ERROR: Invalid cmd: %d\n", cmd);
return -ENOTTY;
}
[nuttx] 02/02: fs_fsync: should not call fs's ioctl when fs not support sync api
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7117d3ea8ac5358e0652708b22a933f91bcf3f10
Author: wangbowen6 <wa...@xiaomi.com>
AuthorDate: Tue Apr 18 14:11:08 2023 +0800
fs_fsync: should not call fs's ioctl when fs not support sync api
Signed-off-by: wangbowen6 <wa...@xiaomi.com>
---
fs/vfs/fs_fsync.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/vfs/fs_fsync.c b/fs/vfs/fs_fsync.c
index 21c361851d..6093c6710f 100644
--- a/fs/vfs/fs_fsync.c
+++ b/fs/vfs/fs_fsync.c
@@ -64,12 +64,14 @@ int file_fsync(FAR struct file *filep)
if (inode != NULL)
{
#ifndef CONFIG_DISABLE_MOUNTPOINT
- if (INODE_IS_MOUNTPT(inode) && inode->u.i_mops &&
- inode->u.i_mops->sync)
+ if (INODE_IS_MOUNTPT(inode))
{
- /* Yes, then tell the mountpoint to sync this file */
+ if (inode->u.i_mops && inode->u.i_mops->sync)
+ {
+ /* Yes, then tell the mountpoint to sync this file */
- return inode->u.i_mops->sync(filep);
+ return inode->u.i_mops->sync(filep);
+ }
}
else
#endif