summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-02-09 15:37:00 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-02-09 15:38:48 +0100
commiteb7753437ff858ebe34a08baef7dfdb45eb0f018 (patch)
tree3e9a8ac739f7f7ee63472879343796ea0bded5d9
parentfstests/fsrename: Avoid double initialization (diff)
downloadrtems-eb7753437ff858ebe34a08baef7dfdb45eb0f018.tar.bz2
Filesystem: Delete unused fsmountme_h handler
-rw-r--r--c/src/lib/libbsp/shared/umon/tfsDriver.c1
-rw-r--r--cpukit/libcsupport/include/rtems/libio.h11
-rw-r--r--cpukit/libcsupport/src/__usrenv.c1
-rw-r--r--cpukit/libfs/Makefile.am2
-rw-r--r--cpukit/libfs/src/defaults/default_fsmount.c27
-rw-r--r--cpukit/libfs/src/defaults/default_ops.c1
-rw-r--r--cpukit/libfs/src/devfs/devfs_init.c1
-rw-r--r--cpukit/libfs/src/dosfs/msdos_init.c1
-rw-r--r--cpukit/libfs/src/imfs/fifoimfs_init.c1
-rw-r--r--cpukit/libfs/src/imfs/imfs_init.c1
-rw-r--r--cpukit/libfs/src/imfs/miniimfs_init.c1
-rw-r--r--cpukit/libfs/src/jffs2/src/fs-rtems.c1
-rw-r--r--cpukit/libfs/src/nfsclient/src/nfs.c1
-rw-r--r--cpukit/libfs/src/rfs/rtems-rfs-rtems.c1
-rw-r--r--cpukit/libnetworking/lib/ftpfs.c1
-rw-r--r--cpukit/libnetworking/lib/tftpDriver.c1
16 files changed, 1 insertions, 52 deletions
diff --git a/c/src/lib/libbsp/shared/umon/tfsDriver.c b/c/src/lib/libbsp/shared/umon/tfsDriver.c
index 43651b0c0e..b87af63bc7 100644
--- a/c/src/lib/libbsp/shared/umon/tfsDriver.c
+++ b/c/src/lib/libbsp/shared/umon/tfsDriver.c
@@ -655,7 +655,6 @@ static const rtems_filesystem_operations_table rtems_tfs_ops = {
.clonenod_h = rtems_tfs_clone_node_info,
.freenod_h = rtems_tfs_free_node_info,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_tfs_mount_me,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_filesystem_default_fsunmount,
.utime_h = rtems_filesystem_default_utime,
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index a959cfec77..7a49978de0 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -481,7 +481,6 @@ struct _rtems_filesystem_operations_table {
rtems_filesystem_clonenode_t clonenod_h;
rtems_filesystem_freenode_t freenod_h;
rtems_filesystem_mount_t mount_h;
- rtems_filesystem_fsmount_me_t fsmount_me_h;
rtems_filesystem_unmount_t unmount_h;
rtems_filesystem_fsunmount_me_t fsunmount_me_h;
rtems_filesystem_utime_t utime_h;
@@ -626,16 +625,6 @@ int rtems_filesystem_default_mount (
/**
* @retval -1 Always. The errno is set to ENOTSUP.
*
- * @see rtems_filesystem_fsmount_me_t.
- */
-int rtems_filesystem_default_fsmount(
- rtems_filesystem_mount_table_entry_t *mt_entry, /* IN */
- const void *data /* IN */
-);
-
-/**
- * @retval -1 Always. The errno is set to ENOTSUP.
- *
* @see rtems_filesystem_unmount_t.
*/
int rtems_filesystem_default_unmount(
diff --git a/cpukit/libcsupport/src/__usrenv.c b/cpukit/libcsupport/src/__usrenv.c
index 8fd107e011..567d42d4d9 100644
--- a/cpukit/libcsupport/src/__usrenv.c
+++ b/cpukit/libcsupport/src/__usrenv.c
@@ -210,7 +210,6 @@ static const rtems_filesystem_operations_table null_ops = {
.clonenod_h = null_op_clonenode,
.freenod_h = rtems_filesystem_default_freenode,
.mount_h = null_op_mount,
- .fsmount_me_h = null_op_fsmount_me,
.unmount_h = null_op_unmount,
.fsunmount_me_h = null_op_fsunmount_me,
.utime_h = null_op_utime,
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index a5af577f94..4bff8cfaf2 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -17,7 +17,7 @@ libdefaultfs_a_SOURCES = \
src/defaults/default_link.c \
src/defaults/default_read.c src/defaults/default_rmnod.c \
src/defaults/default_chown.c \
- src/defaults/default_fcntl.c src/defaults/default_fsmount.c \
+ src/defaults/default_fcntl.c \
src/defaults/default_ftruncate.c src/defaults/default_lseek.c \
src/defaults/default_lseek_file.c \
src/defaults/default_lseek_directory.c \
diff --git a/cpukit/libfs/src/defaults/default_fsmount.c b/cpukit/libfs/src/defaults/default_fsmount.c
deleted file mode 100644
index 48bff85158..0000000000
--- a/cpukit/libfs/src/defaults/default_fsmount.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file
- *
- * @brief RTEMS Default File System Mounts
- * @ingroup LibIOFSOps File System Operations
- */
-
-/*
- * COPYRIGHT (c) 2010.
- * On-Line Applications Research Corporation (OAR).
- *
- * 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.
- */
-
-#include <rtems/libio.h>
-#include <rtems/libio_.h>
-#include <rtems/seterr.h>
-
-int rtems_filesystem_default_fsmount(
- rtems_filesystem_mount_table_entry_t *mt_entry, /* IN */
- const void *data /* IN */
-)
-{
- rtems_set_errno_and_return_minus_one( ENOTSUP );
-}
diff --git a/cpukit/libfs/src/defaults/default_ops.c b/cpukit/libfs/src/defaults/default_ops.c
index 274336f976..63ad2cefe1 100644
--- a/cpukit/libfs/src/defaults/default_ops.c
+++ b/cpukit/libfs/src/defaults/default_ops.c
@@ -34,7 +34,6 @@ const rtems_filesystem_operations_table rtems_filesystem_operations_default = {
.clonenod_h = rtems_filesystem_default_clonenode,
.freenod_h = rtems_filesystem_default_freenode,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_filesystem_default_fsmount,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_filesystem_default_fsunmount,
.utime_h = rtems_filesystem_default_utime,
diff --git a/cpukit/libfs/src/devfs/devfs_init.c b/cpukit/libfs/src/devfs/devfs_init.c
index 9fafc6adf0..cb5099cd0c 100644
--- a/cpukit/libfs/src/devfs/devfs_init.c
+++ b/cpukit/libfs/src/devfs/devfs_init.c
@@ -30,7 +30,6 @@ const rtems_filesystem_operations_table devFS_ops = {
.clonenod_h = rtems_filesystem_default_clonenode,
.freenod_h = rtems_filesystem_default_freenode,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = devFS_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_filesystem_default_fsunmount,
.utime_h = rtems_filesystem_default_utime,
diff --git a/cpukit/libfs/src/dosfs/msdos_init.c b/cpukit/libfs/src/dosfs/msdos_init.c
index 3414563b0c..9201a15098 100644
--- a/cpukit/libfs/src/dosfs/msdos_init.c
+++ b/cpukit/libfs/src/dosfs/msdos_init.c
@@ -64,7 +64,6 @@ const rtems_filesystem_operations_table msdos_ops = {
.clonenod_h = msdos_clone_node_info,
.freenod_h = msdos_free_node_info,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_dosfs_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = msdos_shut_down,
.utime_h = msdos_utime,
diff --git a/cpukit/libfs/src/imfs/fifoimfs_init.c b/cpukit/libfs/src/imfs/fifoimfs_init.c
index 206c96b5a0..17f4917a2c 100644
--- a/cpukit/libfs/src/imfs/fifoimfs_init.c
+++ b/cpukit/libfs/src/imfs/fifoimfs_init.c
@@ -38,7 +38,6 @@ const rtems_filesystem_operations_table fifoIMFS_ops = {
.clonenod_h = IMFS_node_clone,
.freenod_h = IMFS_node_free,
.mount_h = IMFS_mount,
- .fsmount_me_h = fifoIMFS_initialize,
.unmount_h = IMFS_unmount,
.fsunmount_me_h = IMFS_fsunmount,
.utime_h = IMFS_utime,
diff --git a/cpukit/libfs/src/imfs/imfs_init.c b/cpukit/libfs/src/imfs/imfs_init.c
index 21b6220134..5e29880a48 100644
--- a/cpukit/libfs/src/imfs/imfs_init.c
+++ b/cpukit/libfs/src/imfs/imfs_init.c
@@ -34,7 +34,6 @@ const rtems_filesystem_operations_table IMFS_ops = {
.clonenod_h = IMFS_node_clone,
.freenod_h = IMFS_node_free,
.mount_h = IMFS_mount,
- .fsmount_me_h = IMFS_initialize,
.unmount_h = IMFS_unmount,
.fsunmount_me_h = IMFS_fsunmount,
.utime_h = IMFS_utime,
diff --git a/cpukit/libfs/src/imfs/miniimfs_init.c b/cpukit/libfs/src/imfs/miniimfs_init.c
index 22ad26a034..6097f7291f 100644
--- a/cpukit/libfs/src/imfs/miniimfs_init.c
+++ b/cpukit/libfs/src/imfs/miniimfs_init.c
@@ -34,7 +34,6 @@ const rtems_filesystem_operations_table miniIMFS_ops = {
.clonenod_h = IMFS_node_clone,
.freenod_h = IMFS_node_free,
.mount_h = IMFS_mount,
- .fsmount_me_h = miniIMFS_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_filesystem_default_fsunmount,
.utime_h = rtems_filesystem_default_utime,
diff --git a/cpukit/libfs/src/jffs2/src/fs-rtems.c b/cpukit/libfs/src/jffs2/src/fs-rtems.c
index 961cfa34df..ce84d44470 100644
--- a/cpukit/libfs/src/jffs2/src/fs-rtems.c
+++ b/cpukit/libfs/src/jffs2/src/fs-rtems.c
@@ -1105,7 +1105,6 @@ static const rtems_filesystem_operations_table rtems_jffs2_ops = {
.clonenod_h = rtems_jffs2_clonenode,
.freenod_h = rtems_jffs2_freenode,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_jffs2_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_jffs2_fsunmount,
.utime_h = rtems_jffs2_utime,
diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c
index 9ce5924ca8..8980c30b4a 100644
--- a/cpukit/libfs/src/nfsclient/src/nfs.c
+++ b/cpukit/libfs/src/nfsclient/src/nfs.c
@@ -2287,7 +2287,6 @@ const struct _rtems_filesystem_operations_table nfs_fs_ops = {
.clonenod_h = nfs_clonenode,
.freenod_h = nfs_freenode,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_nfs_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = nfs_fsunmount_me,
.utime_h = nfs_utime,
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
index 4a38ee7510..999dfb3cb1 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
@@ -754,7 +754,6 @@ const rtems_filesystem_operations_table rtems_rfs_ops =
.clonenod_h = rtems_filesystem_default_clonenode,
.freenod_h = rtems_filesystem_default_freenode,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_rfs_rtems_initialise,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_rfs_rtems_shutdown,
.utime_h = rtems_rfs_rtems_utime,
diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c
index 61c800755b..170cc3ef7b 100644
--- a/cpukit/libnetworking/lib/ftpfs.c
+++ b/cpukit/libnetworking/lib/ftpfs.c
@@ -1383,7 +1383,6 @@ static const rtems_filesystem_operations_table rtems_ftpfs_ops = {
.clonenod_h = rtems_filesystem_default_clonenode,
.freenod_h = rtems_ftpfs_free_node,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_ftpfs_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_ftpfs_unmount_me,
.utime_h = rtems_filesystem_default_utime,
diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c
index b114a498d9..fd7ddac6a8 100644
--- a/cpukit/libnetworking/lib/tftpDriver.c
+++ b/cpukit/libnetworking/lib/tftpDriver.c
@@ -1031,7 +1031,6 @@ static const rtems_filesystem_operations_table rtems_tftp_ops = {
.clonenod_h = rtems_tftp_clone,
.freenod_h = rtems_tftp_free_node_info,
.mount_h = rtems_filesystem_default_mount,
- .fsmount_me_h = rtems_tftpfs_initialize,
.unmount_h = rtems_filesystem_default_unmount,
.fsunmount_me_h = rtems_tftpfs_shutdown,
.utime_h = rtems_filesystem_default_utime,