From 14724574d90a40ab7a00b1a81d09e22bebc3167e Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 31 May 2010 14:03:41 +0000 Subject: 2010-05-31 Chris Johns * libcsupport/Makefile.am: Add mount-mgr.c. * libcsupport/src/mount-mgr.c: New. * include/rtems/fs.h: Added rtems_filesystem_location_mount. * libcsupport/include/rtems/libio.h, libcsupport/src/mount.c: New mount interface. It is similar to Linux. * libcsupport/include/rtems/libio_.h: Remove the init_fs_mount_table call. * libcsupport/src/base_fs.c: Remove init_fs_mount_table_call. Use the new mount call. Remove setting the root node in the global pathloc. Mount does this now. * libcsupport/src/privateenv.c: Remove the hack to set the root mount table entry in the environment. * libcsupport/src/unmount.cL Free the target string. * libblock/src/bdpart-mount.c: New mount API. * libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_init.c, libfs/src/dosfs/dosfs.h, libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_init.c, libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c, libfs/src/imfs/imfs_init.c, libfs/src/imfs/miniimfs_init.c, libfs/src/nfsclient/src/librtemsNfs.h, libfs/src/rfs/rtems-rfs-rtems.c, libfs/src/rfs/rtems-rfs.h, libnetworking/lib/ftpfs.c, libnetworking/rtems/ftpfs.h, libnetworking/rtems/tftp.h: New mount_h API. * libfs/src/devfs/devfs_eval.c: Local include of extern ops. * libfs/src/nfsclient/src/nfs.c: New mount API. Removed the mount me call and fixed the initialisation to happen when mounting. * libmisc/Makefile.am, libmisc/shell/shellconfig.h: Remove mount filesystem files. * libmisc/fsmount/fsmount.c, libmisc/fsmount/fsmount.h: Updated to the new mount table values. * libmisc/shell/main_mount_ftp.c, libmisc/shell/main_mount_msdos.c, libmisc/shell/main_mount_rfs.c, libmisc/shell/main_mount_tftp.c: Removed. * libmisc/shell/main_mount.c: Use the new mount API. Also access the file system table for the file system types. * libnetworking/lib/tftpDriver.c: Updated to the new mount API. Fixed to allow mounting from any mount point. Also can now have more than file system mounted. * sapi/include/confdefs.h: Add file system configuration support. --- cpukit/libcsupport/src/mount-mgr.c | 187 +++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 cpukit/libcsupport/src/mount-mgr.c (limited to 'cpukit/libcsupport') diff --git a/cpukit/libcsupport/src/mount-mgr.c b/cpukit/libcsupport/src/mount-mgr.c new file mode 100644 index 0000000000..74e3c93333 --- /dev/null +++ b/cpukit/libcsupport/src/mount-mgr.c @@ -0,0 +1,187 @@ +/* + * mount() + * + * Mange the mount table. You can iterate on mounts and file systems, as well + * as add and remove file systems not in the file system confiration table. + * + * COPYRIGHT (c) Chris Johns 2010. + * + * 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. + * + * $Id$ + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * External defined by confdefs.h or the user. + */ +extern const rtems_filesystem_table_t configuration_filesystem_table[]; + +/* + * Points to a list of filesystems added at runtime. + */ +extern rtems_chain_control *rtems_filesystem_table; + +/* + * Mount table list. + */ +extern rtems_chain_control rtems_filesystem_mount_table_control; +extern bool rtems_filesystem_mount_table_control_init; + +/* + * Get the first entry in the filesystem table. + */ +const rtems_filesystem_table_t* +rtems_filesystem_table_first( + void +) +{ + /* + * We can assume this because it is the root file system. + */ + return &configuration_filesystem_table[0]; +} + +/* + * Get the next entry in the file system table. + */ +const rtems_filesystem_table_t* +rtems_filesystem_table_next( + rtems_filesystem_table_t *entry +) +{ + const rtems_filesystem_table_t* fs; + + fs = rtems_filesystem_table_first( ); + + while ( fs->type && ( fs != entry ) ) + ++fs; + + if ( fs->type ) { + ++fs; + if ( fs->type ) + return fs; + } + + if ( rtems_filesystem_table ) { + rtems_chain_node* node; + for (node = rtems_chain_first( rtems_filesystem_table ); + !rtems_chain_is_tail( rtems_filesystem_table, node); + node = rtems_chain_next( node )) { + rtems_filesystem_table_node_t* tnode; + tnode = (rtems_filesystem_table_node_t*) node; + if ( entry == &tnode->entry ) { + node = rtems_chain_next( node ); + if ( !rtems_chain_is_tail( rtems_filesystem_table, node ) ) { + tnode = (rtems_filesystem_table_node_t*) node; + return &tnode->entry; + } + } + } + } + + return NULL; +} + +/* + * Get the first entry in the mount table. + */ +rtems_filesystem_mount_table_entry_t* +rtems_filesystem_mounts_first( + void +) +{ + rtems_filesystem_mount_table_entry_t* entry = NULL; + if ( rtems_filesystem_mount_table_control_init ) { + if ( !rtems_chain_is_empty( &rtems_filesystem_mount_table_control ) ) + entry = (rtems_filesystem_mount_table_entry_t*) + rtems_chain_first( &rtems_filesystem_mount_table_control ); + } + return entry; +} + +/* + * Get the next entry in the mount table. + */ +rtems_filesystem_mount_table_entry_t* +rtems_filesystem_mounts_next( + rtems_filesystem_mount_table_entry_t *entry +) +{ + if ( !rtems_filesystem_mount_table_control_init || !entry ) + return NULL; + return (rtems_filesystem_mount_table_entry_t*) rtems_chain_next( &entry->Node ); +} + +/* + * Register a file system. + */ +int +rtems_filesystem_register( + const char *type, + rtems_filesystem_fsmount_me_t mount_h +) +{ + rtems_filesystem_table_node_t *fs; + if ( !rtems_filesystem_table ) { + rtems_filesystem_table = malloc( sizeof( rtems_chain_control ) ); + if ( !rtems_filesystem_table ) + rtems_set_errno_and_return_minus_one( ENOMEM ); + rtems_chain_initialize_empty ( rtems_filesystem_table ); + } + fs = malloc( sizeof( rtems_filesystem_table_node_t ) ); + if ( !fs ) + rtems_set_errno_and_return_minus_one( ENOMEM ); + fs->entry.type = strdup( type ); + if ( !fs->entry.type ) { + free( fs ); + rtems_set_errno_and_return_minus_one( ENOMEM ); + } + fs->entry.mount_h = mount_h; + rtems_chain_append( rtems_filesystem_table, &fs->node ); + return 0; +} + +/* + * Unregister a file system. + */ +int +rtems_filesystem_unregister( + const char *type +) +{ + if ( rtems_filesystem_table ) { + rtems_chain_node *node; + for (node = rtems_chain_first( rtems_filesystem_table ); + !rtems_chain_is_tail( rtems_filesystem_table, node ); + node = rtems_chain_next( node ) ) { + rtems_filesystem_table_node_t *fs; + fs = (rtems_filesystem_table_node_t*) node; + if ( strcmp( fs->entry.type, type ) == 0 ) { + rtems_chain_extract( node ); + free( (void*) fs->entry.type ); + free( fs ); + return 0; + } + } + } + rtems_set_errno_and_return_minus_one( ENOENT ); +} -- cgit v1.2.3