1 files changed, 72 insertions, 20 deletions

diff --git a/cpukit/libfs/src/imfs/imfs_rmnod.c b/cpukit/libfs/src/imfs/imfs_rmnod.c
index 25c7cde084..c50041942f 100644
--- a/cpukit/libfs/src/imfs/imfs_rmnod.c
+++ b/cpukit/libfs/src/imfs/imfs_rmnod.c
@@ -7,6 +7,9 @@
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modifications to support reference counting in the file system are
+ *  Copyright (c) 2012 embedded brains GmbH.
+ *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
@@ -15,17 +18,13 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+  #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/libio_.h>
-
 #include "imfs.h"
 
+#include <stdlib.h>
+
 void IMFS_create_orphan( IMFS_jnode_t *jnode )
 {
   if ( jnode->Parent != NULL ) {
@@ -40,10 +39,7 @@ void IMFS_create_orphan( IMFS_jnode_t *jnode )
 
 void IMFS_check_node_remove( IMFS_jnode_t *jnode )
 {
-  if ( !rtems_libio_is_file_open( jnode ) && jnode->st_nlink < 1 ) {
-    if ( rtems_filesystem_current.node_access == jnode )
-       rtems_filesystem_current.node_access = NULL;
-
+  if ( jnode->st_nlink < 1 ) {
     switch ( jnode->type ) {
       case IMFS_MEMORY_FILE:
         IMFS_memfile_remove( jnode );
@@ -59,19 +55,75 @@ void IMFS_check_node_remove( IMFS_jnode_t *jnode )
   }
 }
 
-/*
- *  IMFS_rmnod
- */
+static int IMFS_rmnod_directory(
+  const rtems_filesystem_location_info_t *parentloc,
+  const rtems_filesystem_location_info_t *loc
+)
+{
+  IMFS_jnode_t *node = loc->node_access;
+  int rv = 0;
+
+  if ( !rtems_chain_is_empty( &node->info.directory.Entries ) ) {
+    errno = ENOTEMPTY;
+    rv = -1;
+  } else if (
+    rtems_filesystem_location_is_root( loc )
+      || node->info.directory.mt_fs != NULL
+  ) {
+    errno = EBUSY;
+    rv = -1;
+  }
+
+  return rv;
+}
+
+static int IMFS_rmnod_hard_link(
+  const rtems_filesystem_location_info_t *parentloc,
+  const rtems_filesystem_location_info_t *loc
+)
+{
+  int rv = 0;
+  IMFS_jnode_t *node = loc->node_access;
+  IMFS_jnode_t *target = node->info.hard_link.link_node;
+
+  if ( target->st_nlink == 1) {
+    rtems_filesystem_location_info_t target_loc = *loc;
+
+    target_loc.node_access = target;
+    IMFS_Set_handlers( &target_loc );
+
+    rv = (*target_loc.ops->rmnod_h)( parentloc, &target_loc );
+  } else {
+    --target->st_nlink;
+    IMFS_update_ctime( target );
+  }
+
+  return rv;
+}
 
 int IMFS_rmnod(
-  rtems_filesystem_location_info_t  *parent_pathloc, /* IN */
-  rtems_filesystem_location_info_t  *pathloc         /* IN */
+  const rtems_filesystem_location_info_t *parentloc,
+  const rtems_filesystem_location_info_t *loc
 )
 {
-  IMFS_jnode_t *jnode = (IMFS_jnode_t *) pathloc->node_access;
+  int rv = 0;
+  IMFS_jnode_t *node = loc->node_access;
 
-  IMFS_create_orphan( jnode );
-  IMFS_check_node_remove( jnode );
+  switch ( node->type ) {
+    case IMFS_DIRECTORY:
+      rv = IMFS_rmnod_directory( parentloc, loc );
+      break;
+    case IMFS_HARD_LINK:
+      rv = IMFS_rmnod_hard_link( parentloc, loc );
+      break;
+    default:
+      break;
+  }
+
+  if ( rv == 0 ) {
+    IMFS_create_orphan( node );
+    IMFS_check_node_remove( node );
+  }
 
-  return 0;
+  return rv;
 }