You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by tm...@apache.org on 2023/08/08 14:58:38 UTC
[nuttx] 01/07: Revert "Don't call lib_free in the kernel code"
This is an automated email from the ASF dual-hosted git repository.
tmedicci pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b3d620152e1f05d15ecbb5bbd195e60a507bdfbb
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Tue Aug 8 00:14:41 2023 +0300
Revert "Don't call lib_free in the kernel code"
This reverts commit 7884c186208346cf989d28241e4c0eb032c98198.
---
drivers/crypto/dev_urandom.c | 1 +
drivers/net/telnet.c | 2 +-
drivers/wireless/gs2200m.c | 2 +-
fs/inode/fs_inodesearch.c | 2 +-
fs/inode/inode.h | 3 ++-
fs/unionfs/fs_unionfs.c | 4 ++--
fs/vfs/fs_dir.c | 2 +-
fs/vfs/fs_fdopen.c | 1 +
fs/vfs/fs_rename.c | 4 ++--
9 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/dev_urandom.c b/drivers/crypto/dev_urandom.c
index 47569de06c..b6c6efda87 100644
--- a/drivers/crypto/dev_urandom.c
+++ b/drivers/crypto/dev_urandom.c
@@ -37,6 +37,7 @@
#include <errno.h>
#include <assert.h>
+#include <nuttx/lib/lib.h>
#include <nuttx/lib/xorshift128.h>
#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 9b0f0209c0..b86f35544a 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -720,7 +720,7 @@ static int telnet_close(FAR struct file *filep)
}
}
- kmm_free(devpath);
+ lib_free(devpath);
}
for (i = 0; i < CONFIG_TELNET_MAXLCLIENTS; i++)
diff --git a/drivers/wireless/gs2200m.c b/drivers/wireless/gs2200m.c
index adafa80a4f..daec124ef8 100644
--- a/drivers/wireless/gs2200m.c
+++ b/drivers/wireless/gs2200m.c
@@ -3542,7 +3542,7 @@ FAR void *gs2200m_register(FAR const char *devpath,
errout:
nxmutex_destroy(&dev->dev_lock);
- kmm_free(dev->path);
+ lib_free(dev->path);
kmm_free(dev);
return NULL;
}
diff --git a/fs/inode/fs_inodesearch.c b/fs/inode/fs_inodesearch.c
index 19905681f1..553c143f3b 100644
--- a/fs/inode/fs_inodesearch.c
+++ b/fs/inode/fs_inodesearch.c
@@ -358,7 +358,7 @@ static int _inode_search(FAR struct inode_search_s *desc)
name);
if (ret > 0)
{
- kmm_free(desc->buffer);
+ lib_free(desc->buffer);
desc->buffer = buffer;
relpath = buffer;
ret = OK;
diff --git a/fs/inode/inode.h b/fs/inode/inode.h
index 76e0c1e788..6ad3e62475 100644
--- a/fs/inode/inode.h
+++ b/fs/inode/inode.h
@@ -35,6 +35,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/lib/lib.h>
/****************************************************************************
* Pre-processor Definitions
@@ -58,7 +59,7 @@
{ \
if ((d)->buffer != NULL) \
{ \
- kmm_free((d)->buffer); \
+ lib_free((d)->buffer); \
(d)->buffer = NULL; \
} \
} \
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index df693a99d7..53a726840c 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -1770,7 +1770,7 @@ static int unionfs_readdir(FAR struct inode *mountpt,
/* Free the allocated relpath */
- kmm_free(relpath);
+ lib_free(relpath);
/* Check for a duplicate */
@@ -1857,7 +1857,7 @@ static int unionfs_readdir(FAR struct inode *mountpt,
/* Free the allocated relpath */
- kmm_free(relpath);
+ lib_free(relpath);
}
}
}
diff --git a/fs/vfs/fs_dir.c b/fs/vfs/fs_dir.c
index 78f90d1dca..fc78f619fe 100644
--- a/fs/vfs/fs_dir.c
+++ b/fs/vfs/fs_dir.c
@@ -453,7 +453,7 @@ static int dir_close(FAR struct file *filep)
/* Release our references on the contained 'root' inode */
inode_release(inode);
- kmm_free(relpath);
+ lib_free(relpath);
return ret;
}
diff --git a/fs/vfs/fs_fdopen.c b/fs/vfs/fs_fdopen.c
index f4f4d4ce6f..5f7bf7005a 100644
--- a/fs/vfs/fs_fdopen.c
+++ b/fs/vfs/fs_fdopen.c
@@ -33,6 +33,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/lib/lib.h>
#include <nuttx/tls.h>
#include "inode/inode.h"
diff --git a/fs/vfs/fs_rename.c b/fs/vfs/fs_rename.c
index 745ebd50fe..d7dfab2b03 100644
--- a/fs/vfs/fs_rename.c
+++ b/fs/vfs/fs_rename.c
@@ -245,7 +245,7 @@ errout:
RELEASE_SEARCH(&newdesc);
if (subdir != NULL)
{
- kmm_free(subdir);
+ lib_free(subdir);
}
return ret;
@@ -431,7 +431,7 @@ errout_with_newsearch:
RELEASE_SEARCH(&newdesc);
if (subdir != NULL)
{
- kmm_free(subdir);
+ lib_free(subdir);
}
return ret;