summaryrefslogtreecommitdiffstats
path: root/cpukit/libfs/src/imfs/imfs_unlink.c
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2009-06-12 01:53:33 +0000
committerChris Johns <chrisj@rtems.org>2009-06-12 01:53:33 +0000
commit7baa484300d36a9ced34f6642501f91fd1428461 (patch)
tree583b6d8fd3b82ea830bbb4c3b474d6aae1466ebb /cpukit/libfs/src/imfs/imfs_unlink.c
parent9e06eb1e96b9deb9247120797ed68b214635c2be (diff)
downloadrtems-7baa484300d36a9ced34f6642501f91fd1428461.tar.bz2
2009-06-12 Chris Johns <chrisj@rtems.org>
* libblock/src/bdbuf.c: Update comments. * libblock/src/bdpart.c, libblock/src/ide_part_table.c: Get the device from the rdev field of the stat buf. * libcsupport/include/rtems/libio.h: Add a path length to evalpath handler. Add parent locations to rmmod and unlink handlers. * libcsupport/include/rtems/libio_.h: Add a path length to rtems_filesystem_evaluate_path. Add rtems_filesystem_evaluate_relative_path, rtems_filesystem_dirname, and rtems_filesystem_prefix_separators. Remove rtems_filesystem_evaluate_parent. * libcsupport/src/base_fs.c, libcsupport/src/chdir.c, libcsupport/src/chmod.c, libcsupport/src/chown.c, libcsupport/src/chroot.c, libcsupport/src/fchdir.c, libcsupport/src/link.c, libcsupport/src/mount.c, libcsupport/src/open.c, libcsupport/src/privateenv.c, libcsupport/src/readlink.c, libcsupport/src/unmount.c, libcsupport/src/utime.c, libcsupport/src/unmount.c, libcsupport/src/utime.c, libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_eval.c, libfs/src/devfs/devstat.c, libfs/src/dosfs/msdos_create.c, libfs/src/dosfs/msdos_misc.c, libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c, libfs/src/imfs/imfs_load_tar.c, libfs/src/imfs/ioman.c, libfs/src/pipe/pipe.c, libmisc/fsmount/fsmount.c, libnetworking/lib/ftpfs.c: Add the length parameter to the eval call. * libcsupport/src/eval.c: Add rtems_filesystem_prefix_separators, rtems_filesystem_dirname, rtems_filesystem_evaluate_relative_path. Add the length parameter to the eval call. * libcsupport/src/rmdir.c: Find the parent pathloc then the node pathloc from that node. Remove the call to find the parent given the node pathloc. * libcsupport/src/stat.c: Add the length parameter to the eval call. Set the device into the rdev field. * libcsupport/src/unlink.c: Find the parent pathloc then the node pathloc from that node. Remove the call to find the parent given the node pathloc. * libfs/src/dosfs/fat.c, libfs/src/dosfs/msdos_format.c: Get the disk device number from the stat rdev field. * libfs/src/dosfs/msdos.h: Add the length parameter to the eval call. Add the parent pathloc to the rmnod handler. * libfs/src/dosfs/msdos_dir.c: Add the parent pathloc to the rmnod handler. * libfs/src/dosfs/msdos_eval.c: Add the length parameter to the eval and token call. * libfs/src/imfs/imfs_directory.c: Add the parent pathloc to the rmnod handler. * libfs/src/imfs/imfs_fchmod.c: Do not test the mode flags for only the allowed flags. Add the missing flags spec'ed in the POSIX standard. * libfs/src/imfs/imfs_fsunmount.c, libfs/src/imfs/imfs_rmnod.c, libfs/src/imfs/imfs_unlink.c, libfs/src/imfs/memfile.c: Add the parent node. Currently ignored in the IMFS. * libfs/src/imfs/imfs_stat.c: Return the device number in the rdev field. * libfs/src/imfs/imfs_mknod.c, libfs/src/imfs/imfs_symlink.c : Add the length parameter to the token call. * libfs/src/nfsclient/src/nfs.c: Add the length parameter to the eval call and parent node to the rmnod and unlink command. * libmisc/shell/internal.h: Remove the libc mounter decl to make public. * libmisc/shell/main_mount.c: Add support for hooking external mount support for new file systems. * libmisc/shell/shell.h: Add helper functions for the mount command.
Diffstat (limited to 'cpukit/libfs/src/imfs/imfs_unlink.c')
-rw-r--r--cpukit/libfs/src/imfs/imfs_unlink.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpukit/libfs/src/imfs/imfs_unlink.c b/cpukit/libfs/src/imfs/imfs_unlink.c
index b416a09b8e..0ec176ed03 100644
--- a/cpukit/libfs/src/imfs/imfs_unlink.c
+++ b/cpukit/libfs/src/imfs/imfs_unlink.c
@@ -25,7 +25,8 @@
#include <rtems/seterr.h>
int IMFS_unlink(
- rtems_filesystem_location_info_t *loc /* IN */
+ rtems_filesystem_location_info_t *parentloc, /* IN */
+ rtems_filesystem_location_info_t *loc /* IN */
)
{
IMFS_jnode_t *node;
@@ -60,7 +61,7 @@ int IMFS_unlink(
if ( node->info.hard_link.link_node->st_nlink == 1)
{
- result = (*the_link.handlers->rmnod_h)( &the_link );
+ result = (*the_link.handlers->rmnod_h)( parentloc, &the_link );
if ( result != 0 )
return -1;
}
@@ -75,7 +76,7 @@ int IMFS_unlink(
* Now actually free the node we were asked to free.
*/
- result = (*loc->handlers->rmnod_h)( loc );
+ result = (*loc->handlers->rmnod_h)( parentloc, loc );
return result;
}