diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:04:02 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:04:02 -0600 |
commit | 7482b7ad0f60724e593a8919783444ef79f4c79e (patch) | |
tree | 396e7019c35eb0f49f430c1132972eedc292a752 /nuttx/fs/smartfs | |
parent | 2ad3a4c2a2b56a721180faa3c689110d86d90359 (diff) | |
download | nuttx-7482b7ad0f60724e593a8919783444ef79f4c79e.tar.gz nuttx-7482b7ad0f60724e593a8919783444ef79f4c79e.tar.bz2 nuttx-7482b7ad0f60724e593a8919783444ef79f4c79e.zip |
Rename kfree to kmm_free for consistency with other naming conventions
Diffstat (limited to 'nuttx/fs/smartfs')
-rw-r--r-- | nuttx/fs/smartfs/smartfs_procfs.c | 4 | ||||
-rw-r--r-- | nuttx/fs/smartfs/smartfs_smart.c | 22 | ||||
-rw-r--r-- | nuttx/fs/smartfs/smartfs_utils.c | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/nuttx/fs/smartfs/smartfs_procfs.c b/nuttx/fs/smartfs/smartfs_procfs.c index 9bac410ea..8f8ff3d4f 100644 --- a/nuttx/fs/smartfs/smartfs_procfs.c +++ b/nuttx/fs/smartfs/smartfs_procfs.c @@ -210,7 +210,7 @@ static int smartfs_close(FAR struct file *filep) /* Release the file attributes structure */ - kfree(priv); + kmm_free(priv); filep->f_priv = NULL; return OK; } @@ -342,7 +342,7 @@ static int smartfs_closedir(FAR struct fs_dirent_s *dir) if (priv) { - kfree(priv); + kmm_free(priv); } dir->u.procfs = NULL; diff --git a/nuttx/fs/smartfs/smartfs_smart.c b/nuttx/fs/smartfs/smartfs_smart.c index 42878a779..fe398fa68 100644 --- a/nuttx/fs/smartfs/smartfs_smart.c +++ b/nuttx/fs/smartfs/smartfs_smart.c @@ -328,11 +328,11 @@ errout_with_buffer: { /* Free the space for the name too */ - kfree(sf->entry.name); + kmm_free(sf->entry.name); sf->entry.name = NULL; } - kfree(sf); + kmm_free(sf); errout_with_semaphore: smartfs_semgive(fs); @@ -423,10 +423,10 @@ static int smartfs_close(FAR struct file *filep) { /* Free the space for the name too */ - kfree(sf->entry.name); + kmm_free(sf->entry.name); sf->entry.name = NULL; } - kfree(sf); + kmm_free(sf); okout: smartfs_semgive(fs); @@ -1143,7 +1143,7 @@ errout_with_semaphore: if (entry.name != NULL) { - kfree(entry.name); + kmm_free(entry.name); entry.name = NULL; } @@ -1372,7 +1372,7 @@ static int smartfs_bind(FAR struct inode *blkdriver, const void *data, ret = smartfs_mount(fs, true); if (ret != 0) { - kfree(fs); + kmm_free(fs); smartfs_semgive(fs); return ret; } @@ -1420,7 +1420,7 @@ static int smartfs_unbind(void *handle, FAR struct inode **blkdriver) } smartfs_semgive(fs); - kfree(fs); + kmm_free(fs); return ret; } @@ -1604,7 +1604,7 @@ errout_with_semaphore: { /* Free the filename space allocation */ - kfree(entry.name); + kmm_free(entry.name); entry.name = NULL; } @@ -1885,13 +1885,13 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath, errout_with_semaphore: if (oldentry.name != NULL) { - kfree(oldentry.name); + kmm_free(oldentry.name); oldentry.name = NULL; } if (newentry.name != NULL) { - kfree(newentry.name); + kmm_free(newentry.name); newentry.name = NULL; } @@ -1967,7 +1967,7 @@ static int smartfs_stat(struct inode *mountpt, const char *relpath, struct stat errout_with_semaphore: if (entry.name != NULL) { - kfree(entry.name); + kmm_free(entry.name); entry.name = NULL; } diff --git a/nuttx/fs/smartfs/smartfs_utils.c b/nuttx/fs/smartfs/smartfs_utils.c index 3c41ce524..86b43cb09 100644 --- a/nuttx/fs/smartfs/smartfs_utils.c +++ b/nuttx/fs/smartfs/smartfs_utils.c @@ -340,8 +340,8 @@ int smartfs_unmount(struct smartfs_mountpt_s *fs) /* Free the buffers */ - kfree(fs->fs_rwbuffer); - kfree(fs->fs_workbuffer); + kmm_free(fs->fs_rwbuffer); + kmm_free(fs->fs_workbuffer); /* Set the buffer's to invalid value to catch program bugs */ @@ -378,8 +378,8 @@ int smartfs_unmount(struct smartfs_mountpt_s *fs) /* Release the mountpoint private data */ - kfree(fs->fs_rwbuffer); - kfree(fs->fs_workbuffer); + kmm_free(fs->fs_rwbuffer); + kmm_free(fs->fs_workbuffer); #endif return ret; |