RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-07-21 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libcsupport/include/rtems/libio_.h: Added
	rtems_filesystem_is_root_location().
	* libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_eval.c,
	libfs/src/dosfs/msdos_dir.c, libfs/src/dosfs/msdos_eval.c: Use
	rtems_filesystem_is_root_location().
This commit is contained in:
Sebastian Huber
2011-07-21 12:03:26 +00:00
parent 51ab73b5d2
commit a2900a8b4b
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
2011-07-21 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libcsupport/include/rtems/libio_.h: Added
rtems_filesystem_is_root_location().
* libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_eval.c,
libfs/src/dosfs/msdos_dir.c, libfs/src/dosfs/msdos_eval.c: Use
rtems_filesystem_is_root_location().
2011-07-21 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1842/cpukit

7
cpukit/libcsupport/include/rtems/libio_.h
View File

@@ -238,6 +238,13 @@ void rtems_filesystem_get_sym_start_loc(const char *path,
int *index,
rtems_filesystem_location_info_t *loc);
static inline bool rtems_filesystem_is_root_location(
const rtems_filesystem_location_info_t *loc
)
{
return loc->mt_entry->mt_fs_root.node_access == loc->node_access;
}
#ifdef __cplusplus
}
#endif

2
cpukit/libfs/src/dosfs/msdos_dir.c
View File

@@ -679,7 +679,7 @@ msdos_dir_rmnod(rtems_filesystem_location_info_t *parent_pathloc,
/*
* You cannot remove the file system root node.
*/
if (pathloc->mt_entry->mt_fs_root.node_access == pathloc->node_access)
if (rtems_filesystem_is_root_location(pathloc))
{
rtems_semaphore_release(fs_info->vol_sema);
rtems_set_errno_and_return_minus_one(EBUSY);

6
cpukit/libfs/src/dosfs/msdos_eval.c
View File

@@ -128,8 +128,7 @@ msdos_eval_path(
/*
* Am I at the root of this mounted filesystem?
*/
if (pathloc->node_access ==
pathloc->mt_entry->mt_fs_root.node_access)
if (rtems_filesystem_is_root_location(pathloc))
{
/*
* Am I at the root of all filesystems?
@@ -310,8 +309,7 @@ msdos_eval4make(
/*
* Am I at the root of this mounted filesystem?
*/
if (pathloc->node_access ==
pathloc->mt_entry->mt_fs_root.node_access)
if (rtems_filesystem_is_root_location(pathloc))
{
/*
* Am I at the root of all filesystems?

2
cpukit/libfs/src/imfs/imfs_directory.c
View File

@@ -300,7 +300,7 @@ int imfs_dir_rmnod(
* You cannot remove the file system root node.
*/
if ( pathloc->mt_entry->mt_fs_root.node_access == pathloc->node_access )
if ( rtems_filesystem_is_root_location(pathloc) )
rtems_set_errno_and_return_minus_one( EBUSY );
/*

5
cpukit/libfs/src/imfs/imfs_eval.c
View File

@@ -346,7 +346,7 @@ int IMFS_evaluate_for_make(
* Am I at the root of this mounted filesystem?
*/
if (pathloc->node_access == pathloc->mt_entry->mt_fs_root.node_access){
if ( rtems_filesystem_is_root_location( pathloc ) ) {
/*
* Am I at the root of all filesystems?
@@ -544,8 +544,7 @@ int IMFS_eval_path(
* Am I at the root of this mounted filesystem?
*/
if (pathloc->node_access ==
pathloc->mt_entry->mt_fs_root.node_access) {
if ( rtems_filesystem_is_root_location( pathloc ) ) {
/*
* Am I at the root of all filesystems?