[rtems commit] Filesystem: Rename function
Sebastian Huber
sebh at rtems.org
Sun Oct 7 15:17:49 UTC 2012
Module: rtems
Branch: master
Commit: 8b65f389aac940a5aadcf190894fdba1b75453f2
Changeset: http://git.rtems.org/rtems/commit/?id=8b65f389aac940a5aadcf190894fdba1b75453f2
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Sun Oct 7 17:12:49 2012 +0200
Filesystem: Rename function
Rename rtems_filesystem_location_is_root() into
rtems_filesystem_location_is_instance_root() to distinguish this from
the file system root directory of the current task environment.
---
cpukit/libcsupport/include/rtems/libio_.h | 2 +-
cpukit/libcsupport/src/mount.c | 2 +-
cpukit/libcsupport/src/rmdir.c | 2 +-
cpukit/libcsupport/src/unlink.c | 2 +-
cpukit/libcsupport/src/unmount.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h
index 1e4bb84..fb8b534 100644
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/libcsupport/include/rtems/libio_.h
@@ -592,7 +592,7 @@ void rtems_filesystem_do_unmount(
rtems_filesystem_mount_table_entry_t *mt_entry
);
-static inline bool rtems_filesystem_location_is_root(
+static inline bool rtems_filesystem_location_is_instance_root(
const rtems_filesystem_location_info_t *loc
)
{
diff --git a/cpukit/libcsupport/src/mount.c b/cpukit/libcsupport/src/mount.c
index 84283bc..a6c4321 100644
--- a/cpukit/libcsupport/src/mount.c
+++ b/cpukit/libcsupport/src/mount.c
@@ -115,7 +115,7 @@ static int register_subordinate_file_system(
rtems_filesystem_location_info_t *currentloc =
rtems_filesystem_eval_path_start( &ctx, target, eval_flags );
- if ( !rtems_filesystem_location_is_root( currentloc ) ) {
+ if ( !rtems_filesystem_location_is_instance_root( currentloc ) ) {
rtems_filesystem_location_info_t targetloc;
rtems_filesystem_global_location_t *mt_point_node;
diff --git a/cpukit/libcsupport/src/rmdir.c b/cpukit/libcsupport/src/rmdir.c
index f2bc16e..5e4c9f1 100644
--- a/cpukit/libcsupport/src/rmdir.c
+++ b/cpukit/libcsupport/src/rmdir.c
@@ -38,7 +38,7 @@ int rmdir( const char *path )
rtems_filesystem_node_types_t type = (*ops->node_type_h)( currentloc );
if ( type == RTEMS_FILESYSTEM_DIRECTORY ) {
- if ( !rtems_filesystem_location_is_root( currentloc ) ) {
+ if ( !rtems_filesystem_location_is_instance_root( currentloc ) ) {
rv = (*ops->rmnod_h)( &parentloc, currentloc );
} else {
rtems_filesystem_eval_path_error( &ctx, EBUSY );
diff --git a/cpukit/libcsupport/src/unlink.c b/cpukit/libcsupport/src/unlink.c
index 2a3b1c7..a007cc2 100644
--- a/cpukit/libcsupport/src/unlink.c
+++ b/cpukit/libcsupport/src/unlink.c
@@ -35,7 +35,7 @@ int unlink( const char *path )
parent_eval_flags
);
- if ( !rtems_filesystem_location_is_root( currentloc ) ) {
+ if ( !rtems_filesystem_location_is_instance_root( currentloc ) ) {
const rtems_filesystem_operations_table *ops = currentloc->mt_entry->ops;
rv = (*ops->rmnod_h)( &parentloc, currentloc );
diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c
index ad45220..b888dee 100644
--- a/cpukit/libcsupport/src/unmount.c
+++ b/cpukit/libcsupport/src/unmount.c
@@ -43,7 +43,7 @@ int unmount( const char *path )
rtems_filesystem_eval_path_start( &ctx, path, eval_flags );
rtems_filesystem_mount_table_entry_t *mt_entry = currentloc->mt_entry;
- if ( rtems_filesystem_location_is_root( currentloc ) ) {
+ if ( rtems_filesystem_location_is_instance_root( currentloc ) ) {
if ( !contains_root_or_current_directory( mt_entry ) ) {
const rtems_filesystem_operations_table *mt_point_ops =
mt_entry->mt_point_node->location.mt_entry->ops;
More information about the vc
mailing list