You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/07/28 13:52:10 UTC
[incubator-nuttx] branch master updated: vfs: Remove the unnessary check when CONFIG_DEBUG_MM enable
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 2b0e28e492 vfs: Remove the unnessary check when CONFIG_DEBUG_MM enable
2b0e28e492 is described below
commit 2b0e28e4924df91fd66dee0300580caff62f3194
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jul 28 02:00:33 2022 +0800
vfs: Remove the unnessary check when CONFIG_DEBUG_MM enable
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/fat/fs_fat32.c | 14 --------------
fs/hostfs/hostfs.c | 14 --------------
fs/rpmsgfs/rpmsgfs.c | 14 --------------
fs/smartfs/smartfs_smart.c | 14 --------------
4 files changed, 56 deletions(-)
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index 7177d75fa1..5c47340a94 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -720,21 +720,7 @@ static ssize_t fat_write(FAR struct file *filep, FAR const char *buffer,
bool force_indirect = false;
#endif
- /* Sanity checks. I have seen the following assertion misfire if
- * CONFIG_DEBUG_MM is enabled while re-directing output to a
- * file. In this case, the debug output can get generated while
- * the file is being opened, FAT data structures are being allocated,
- * and things are generally in a perverse state.
- */
-
-#ifdef CONFIG_DEBUG_MM
- if (filep->f_priv == NULL || filep->f_inode == NULL)
- {
- return -ENXIO;
- }
-#else
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
-#endif
/* Recover our private data from the struct file instance */
diff --git a/fs/hostfs/hostfs.c b/fs/hostfs/hostfs.c
index 6e0a221606..4ebca506c2 100644
--- a/fs/hostfs/hostfs.c
+++ b/fs/hostfs/hostfs.c
@@ -490,21 +490,7 @@ static ssize_t hostfs_write(FAR struct file *filep, const char *buffer,
FAR struct hostfs_ofile_s *hf;
ssize_t ret;
- /* Sanity checks. I have seen the following assertion misfire if
- * CONFIG_DEBUG_MM is enabled while re-directing output to a
- * file. In this case, the debug output can get generated while
- * the file is being opened, FAT data structures are being allocated,
- * and things are generally in a perverse state.
- */
-
-#ifdef CONFIG_DEBUG_MM
- if (filep->f_priv == NULL || filep->f_inode == NULL)
- {
- return -ENXIO;
- }
-#else
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
-#endif
/* Recover our private data from the struct file instance */
diff --git a/fs/rpmsgfs/rpmsgfs.c b/fs/rpmsgfs/rpmsgfs.c
index e225d8e79d..6f91a373b9 100644
--- a/fs/rpmsgfs/rpmsgfs.c
+++ b/fs/rpmsgfs/rpmsgfs.c
@@ -528,21 +528,7 @@ static ssize_t rpmsgfs_write(FAR struct file *filep, const char *buffer,
FAR struct rpmsgfs_ofile_s *hf;
ssize_t ret;
- /* Sanity checks. I have seen the following assertion misfire if
- * CONFIG_DEBUG_MM is enabled while re-directing output to a
- * file. In this case, the debug output can get generated while
- * the file is being opened, FAT data structures are being allocated,
- * and things are generally in a perverse state.
- */
-
-#ifdef CONFIG_DEBUG_MM
- if (filep->f_priv == NULL || filep->f_inode == NULL)
- {
- return -ENXIO;
- }
-#else
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
-#endif
/* Recover our private data from the struct file instance */
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index d2fb7b9fa6..eb403c0d3a 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -641,21 +641,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
size_t byteswritten;
int ret;
- /* Sanity checks. I have seen the following assertion misfire if
- * CONFIG_DEBUG_MM is enabled while re-directing output to a
- * file. In this case, the debug output can get generated while
- * the file is being opened, FAT data structures are being allocated,
- * and things are generally in a perverse state.
- */
-
-#ifdef CONFIG_DEBUG_MM
- if (filep->f_priv == NULL || filep->f_inode == NULL)
- {
- return -ENXIO;
- }
-#else
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
-#endif
/* Recover our private data from the struct file instance */