Filesystem: Delete node type operation

Use the fstat handler instead.

5 files changed, 5 insertions, 65 deletions

diff --git a/cpukit/libfs/src/imfs/fifoimfs_init.c b/cpukit/libfs/src/imfs/fifoimfs_init.c
index d540139f55..81041e9902 100644
--- a/cpukit/libfs/src/imfs/fifoimfs_init.c
+++ b/cpukit/libfs/src/imfs/fifoimfs_init.c
@@ -31,7 +31,6 @@ const rtems_filesystem_operations_table fifoIMFS_ops = {
   .eval_path_h = IMFS_eval_path,
   .link_h = IMFS_link,
   .are_nodes_equal_h = rtems_filesystem_default_are_nodes_equal,
-  .node_type_h = IMFS_node_type,
   .mknod_h = IMFS_mknod,
   .rmnod_h = IMFS_rmnod,
   .fchmod_h = IMFS_fchmod,
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h
index 7dca51f97a..c34f89fd15 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/libfs/src/imfs/imfs.h
@@ -136,11 +136,11 @@ typedef struct {
  *  What types of IMFS file systems entities there can be.
  */
 typedef enum {
-  IMFS_DIRECTORY = RTEMS_FILESYSTEM_DIRECTORY,
-  IMFS_DEVICE = RTEMS_FILESYSTEM_DEVICE,
-  IMFS_HARD_LINK = RTEMS_FILESYSTEM_HARD_LINK,
-  IMFS_SYM_LINK =  RTEMS_FILESYSTEM_SYM_LINK,
-  IMFS_MEMORY_FILE = RTEMS_FILESYSTEM_MEMORY_FILE,
+  IMFS_DIRECTORY,
+  IMFS_DEVICE,
+  IMFS_HARD_LINK,
+  IMFS_SYM_LINK,
+  IMFS_MEMORY_FILE,
   IMFS_LINEAR_FILE,
   IMFS_FIFO,
   IMFS_GENERIC,
@@ -515,16 +515,6 @@ extern int IMFS_node_clone( rtems_filesystem_location_info_t *loc );
 extern void IMFS_node_free( const rtems_filesystem_location_info_t *loc );
 
 /**
- * @brief IMFS Node Type Get the type of an IMFS node.
- * 
- * The following verifies that returns the type of node that the
- * loc refers to.
- */
-extern rtems_filesystem_node_types_t IMFS_node_type(
-  const rtems_filesystem_location_info_t *loc
-);
-
-/**
  * @brief Perform a status processing for the IMFS.
  * 
  * This routine provides a stat for the IMFS file system.
diff --git a/cpukit/libfs/src/imfs/imfs_init.c b/cpukit/libfs/src/imfs/imfs_init.c
index 8c434ebcba..596f81bdda 100644
--- a/cpukit/libfs/src/imfs/imfs_init.c
+++ b/cpukit/libfs/src/imfs/imfs_init.c
@@ -27,7 +27,6 @@ const rtems_filesystem_operations_table IMFS_ops = {
   .eval_path_h = IMFS_eval_path,
   .link_h = IMFS_link,
   .are_nodes_equal_h = rtems_filesystem_default_are_nodes_equal,
-  .node_type_h = IMFS_node_type,
   .mknod_h = IMFS_mknod,
   .rmnod_h = IMFS_rmnod,
   .fchmod_h = IMFS_fchmod,
diff --git a/cpukit/libfs/src/imfs/imfs_ntype.c b/cpukit/libfs/src/imfs/imfs_ntype.c
deleted file mode 100644
index 0c92bc9c15..0000000000
--- a/cpukit/libfs/src/imfs/imfs_ntype.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file
- *
- * @brief IMFS Node Type
- * @ingroup IMFS
- */
-
-/*
- *  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.org/license/LICENSE.
- */
-
-#if HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include "imfs.h"
-
-rtems_filesystem_node_types_t IMFS_node_type(
-  const rtems_filesystem_location_info_t *loc
-)
-{
-  const IMFS_jnode_t *node = loc->node_access;
-  IMFS_jnode_types_t imfs_type = IMFS_type( node );
-  rtems_filesystem_node_types_t type;
-
-  switch ( imfs_type ) {
-    case IMFS_HARD_LINK:
-      type = IMFS_type( node->info.hard_link.link_node );
-      break;
-    case IMFS_LINEAR_FILE:
-      type = RTEMS_FILESYSTEM_MEMORY_FILE;
-      break;
-    default:
-      type = imfs_type;
-      break;
-  }
-
-  return type;
-}
diff --git a/cpukit/libfs/src/imfs/miniimfs_init.c b/cpukit/libfs/src/imfs/miniimfs_init.c
index 11fc9bc210..9e0ca0b033 100644
--- a/cpukit/libfs/src/imfs/miniimfs_init.c
+++ b/cpukit/libfs/src/imfs/miniimfs_init.c
@@ -27,7 +27,6 @@ const rtems_filesystem_operations_table miniIMFS_ops = {
   .eval_path_h = IMFS_eval_path,
   .link_h = rtems_filesystem_default_link,
   .are_nodes_equal_h = rtems_filesystem_default_are_nodes_equal,
-  .node_type_h = IMFS_node_type,
   .mknod_h = IMFS_mknod,
   .rmnod_h = IMFS_rmnod,
   .fchmod_h = rtems_filesystem_default_fchmod,