summaryrefslogtreecommitdiffstats
path: root/cpukit/libcsupport/src/unmount.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-17 17:57:42 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-17 17:57:42 +0000
commitefb5450a87d50c53584d361c92d5928098233f58 (patch)
tree8068a8a16853a494ec4b565475d4d0f015872b2b /cpukit/libcsupport/src/unmount.c
parent2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-efb5450a87d50c53584d361c92d5928098233f58.tar.bz2
2001-10-17 Till Straumann <strauman@SLAC.Stanford.EDU>
* These changes were discussed and reviewed by many people but the primary people were Jennifer Averett <jennifer@OARcorp.com> and Eugeny Mints <jack@oktet.ru>. * libc/utime.c: Add missing call to rtems_filesystem_freenode() at verification that utime is supported by the filesystem. * libc/link.c: Remove calls to freenode when the node was not successfully allocated. * libc/unmount.c: In the method file_systems_below_this_mountpoint() added calls to correctly free fs_root_loc when a failure occurs. * libc/open.c: Add freenode calls upon failure. * libc/open.c, lib/libc/close.c: (PENDING -- NOT INCLUDED THIS TIMER) Modifications the move the freenode from open() to close() (also part of this patch) are pending further discussion.
Diffstat (limited to 'cpukit/libcsupport/src/unmount.c')
-rw-r--r--cpukit/libcsupport/src/unmount.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c
index dfd1797112..81e097c818 100644
--- a/cpukit/libcsupport/src/unmount.c
+++ b/cpukit/libcsupport/src/unmount.c
@@ -168,8 +168,10 @@ int file_systems_below_this_mountpoint(
*/
*fs_to_unmount = *fs_root_loc->mt_entry;
- if ( fs_to_unmount->mt_fs_root.node_access != fs_root_loc->node_access )
+ if ( fs_to_unmount->mt_fs_root.node_access != fs_root_loc->node_access ){
+ rtems_filesystem_freenode(fs_root_loc);
set_errno_and_return_minus_one( EACCES );
+ }
/*
* Search the mount table for any mount entries referencing this
@@ -181,7 +183,8 @@ int file_systems_below_this_mountpoint(
the_node = the_node->next ) {
the_mount_entry = ( rtems_filesystem_mount_table_entry_t * )the_node;
if (the_mount_entry->mt_point_node.mt_entry == fs_root_loc->mt_entry ) {
- set_errno_and_return_minus_one( EBUSY );
+ rtems_filesystem_freenode(fs_root_loc);
+ set_errno_and_return_minus_one( EBUSY );
}
}