change log for rtems (2010-07-01)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Jul 1 13:14:06 UTC 2010
*sh*:
2010-07-01 Sebastian Huber <sebastian.huber at embedded-brains.de>
* libcsupport/include/rtems/libio_.h: Removed
rtems_filesystem_mount_table_control.
* libcsupport/include/rtems/libio.h, libcsupport/src/mount-mgr.c,
libcsupport/src/mount.c libcsupport/src/statvfs.c,
libcsupport/src/unmount.c, libmisc/shell/main_mount.c: Documentation.
Removed rtems_filesystem_mounts_first() and
rtems_filesystem_mounts_next(). Added
rtems_filesystem_mount_iterate(). Changed return type of
rtems_filesystem_iterate(). Removed rtems_filesystem_nodes_equal().
M 1.2478 cpukit/ChangeLog
M 1.75 cpukit/libcsupport/include/rtems/libio.h
M 1.39 cpukit/libcsupport/include/rtems/libio_.h
M 1.4 cpukit/libcsupport/src/mount-mgr.c
M 1.38 cpukit/libcsupport/src/mount.c
M 1.3 cpukit/libcsupport/src/statvfs.c
M 1.27 cpukit/libcsupport/src/unmount.c
M 1.10 cpukit/libmisc/shell/main_mount.c
diff -u rtems/cpukit/ChangeLog:1.2477 rtems/cpukit/ChangeLog:1.2478
--- rtems/cpukit/ChangeLog:1.2477 Thu Jul 1 04:49:05 2010
+++ rtems/cpukit/ChangeLog Thu Jul 1 08:05:15 2010
@@ -1,5 +1,17 @@
2010-07-01 Sebastian Huber <sebastian.huber at embedded-brains.de>
+ * libcsupport/include/rtems/libio_.h: Removed
+ rtems_filesystem_mount_table_control.
+ * libcsupport/include/rtems/libio.h, libcsupport/src/mount-mgr.c,
+ libcsupport/src/mount.c libcsupport/src/statvfs.c,
+ libcsupport/src/unmount.c, libmisc/shell/main_mount.c: Documentation.
+ Removed rtems_filesystem_mounts_first() and
+ rtems_filesystem_mounts_next(). Added
+ rtems_filesystem_mount_iterate(). Changed return type of
+ rtems_filesystem_iterate(). Removed rtems_filesystem_nodes_equal().
+
+2010-07-01 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
* libfs/src/nfsclient/src/nfs.c, libfs/src/nfsclient/src/nfs.c,
libfs/src/nfsclient/src/librtemsNfs.h: Renamed
rtems_nfsfs_initialize() in rtems_nfs_initialize().
diff -u rtems/cpukit/libcsupport/include/rtems/libio.h:1.74 rtems/cpukit/libcsupport/include/rtems/libio.h:1.75
--- rtems/cpukit/libcsupport/include/rtems/libio.h:1.74 Wed Jun 30 08:58:56 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio.h Thu Jul 1 08:05:18 2010
@@ -1039,46 +1039,6 @@
);
/**
- * @brief File system table entry.
- */
-typedef struct rtems_filesystem_table_t {
- const char *type;
- rtems_filesystem_fsmount_me_t mount_h;
-} rtems_filesystem_table_t;
-
-/**
- * @brief Static table of file systems.
- *
- * Externally defined by confdefs.h or the user.
- */
-extern const rtems_filesystem_table_t rtems_filesystem_table [];
-
-/**
- * @brief Per file system table entry routine type.
- *
- * @see rtems_filesystem_iterate().
- *
- * @retval true Continue the iteration.
- * @retval false Stop the iteration.
- */
-typedef bool (*rtems_per_filesystem_routine)(
- const rtems_filesystem_table_t *entry,
- void *arg
-);
-
-/**
- * @brief Iterates over the file system table.
- *
- * For each file system table entry the @a routine will be called with the
- * table entry and the @a routine_arg parameter.
- */
-void
-rtems_filesystem_iterate(
- rtems_per_filesystem_routine routine,
- void *routine_arg
-);
-
-/**
* @brief Gets the mount handler for the file system @a type.
*
* @return The file system mount handler associated with the @a type, or
@@ -1089,35 +1049,6 @@
const char *type
);
-/*
- * Get the first entry in the mount table.
- */
-rtems_filesystem_mount_table_entry_t*
-rtems_filesystem_mounts_first( void );
-
-/*
- * 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 );
-
-/*
- * Register a file system.
- */
-int
-rtems_filesystem_register(
- const char *type,
- rtems_filesystem_fsmount_me_t mount_h
-);
-
-/*
- * Unregister a file system.
- */
-int
-rtems_filesystem_unregister(
- const char *type
-);
-
/**
* @brief Contain file system specific information which is required to support
* fpathconf().
@@ -1145,67 +1076,6 @@
extern const rtems_filesystem_limits_and_options_t rtems_filesystem_default_pathconf;
/**
- * @brief Mount table entry.
- */
-struct rtems_filesystem_mount_table_entry_tt {
- rtems_chain_node Node;
- rtems_filesystem_location_info_t mt_point_node;
- rtems_filesystem_location_info_t mt_fs_root;
- int options;
- void *fs_info;
-
- rtems_filesystem_limits_and_options_t pathconf_limits_and_options;
-
- /*
- * The target or mount point of the file system.
- */
- const char *target;
-
- /*
- * The type of filesystem or the name of the filesystem.
- */
- const char *type;
-
- /*
- * When someone adds a mounted filesystem on a real device,
- * this will need to be used.
- *
- * The lower layers can manage how this is managed. Leave as a
- * string.
- */
- char *dev;
-};
-
-/**
- * @brief The pathconf setting for a file system.
- */
-#define rtems_filesystem_pathconf(_mte) ((_mte)->pathconf_limits_and_options)
-
-/**
- * @brief The type of file system. Its name.
- */
-#define rtems_filesystem_type(_mte) ((_mte)->type)
-
-/**
- * @brief The mount point of a file system.
- */
-#define rtems_filesystem_mount_point(_mte) ((_mte)->target)
-
-/**
- * @brief The device entry of a file system.
- */
-#define rtems_filesystem_mount_device(_mte) ((_mte)->dev)
-
-/**
- * @brief File systems options.
- */
-typedef enum {
- RTEMS_FILESYSTEM_READ_ONLY,
- RTEMS_FILESYSTEM_READ_WRITE,
- RTEMS_FILESYSTEM_BAD_OPTIONS
-} rtems_filesystem_options_t;
-
-/**
* @brief An open file data structure.
*
* It will be indexed by 'fd'.
@@ -1394,6 +1264,46 @@
#define rtems_libio_is_valid_perms( _perm ) \
(~ ((~RTEMS_LIBIO_PERMS_RWX) & _perm ))
+/*
+ * Prototypes for filesystem
+ */
+
+void rtems_filesystem_initialize( void );
+
+typedef void (*rtems_libio_init_functions_t)(void);
+extern rtems_libio_init_functions_t rtems_libio_init_helper;
+
+void open_dev_console(void);
+
+typedef void (*rtems_libio_supp_functions_t)(void);
+extern rtems_libio_supp_functions_t rtems_libio_supp_helper;
+
+typedef void (*rtems_fs_init_functions_t)(void);
+extern rtems_fs_init_functions_t rtems_fs_init_helper;
+
+/**
+ * @brief Creates a directory and all its parent directories according to
+ * @a path.
+ *
+ * The @a mode value selects the access permissions of the directory.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occured. The @c errno indicates the error.
+ */
+extern int rtems_mkdir(const char *path, mode_t mode);
+
+/** @} */
+
+/**
+ * @defgroup FileSystemTypesAndMount File System Types and Mount
+ *
+ * @ingroup LibIO
+ *
+ * @brief File system types and mount.
+ *
+ * @{
+ */
+
/**
* @name File System Types
*
@@ -1411,16 +1321,132 @@
/** @} */
-/*
- * Prototypes for filesystem
+/**
+ * @brief Mount table entry.
*/
+struct rtems_filesystem_mount_table_entry_tt {
+ rtems_chain_node Node;
+ rtems_filesystem_location_info_t mt_point_node;
+ rtems_filesystem_location_info_t mt_fs_root;
+ int options;
+ void *fs_info;
-void rtems_filesystem_initialize( void );
+ rtems_filesystem_limits_and_options_t pathconf_limits_and_options;
+
+ /*
+ * The target or mount point of the file system.
+ */
+ const char *target;
+
+ /*
+ * The type of filesystem or the name of the filesystem.
+ */
+ const char *type;
+
+ /*
+ * When someone adds a mounted filesystem on a real device,
+ * this will need to be used.
+ *
+ * The lower layers can manage how this is managed. Leave as a
+ * string.
+ */
+ char *dev;
+};
+
+/**
+ * @brief File system options.
+ */
+typedef enum {
+ RTEMS_FILESYSTEM_READ_ONLY,
+ RTEMS_FILESYSTEM_READ_WRITE,
+ RTEMS_FILESYSTEM_BAD_OPTIONS
+} rtems_filesystem_options_t;
+
+/**
+ * @brief File system table entry.
+ */
+typedef struct rtems_filesystem_table_t {
+ const char *type;
+ rtems_filesystem_fsmount_me_t mount_h;
+} rtems_filesystem_table_t;
+/**
+ * @brief Static table of file systems.
+ *
+ * Externally defined by confdefs.h or the user.
+ */
+extern const rtems_filesystem_table_t rtems_filesystem_table [];
+
+/**
+ * @brief Registers a file system @a type.
+ *
+ * The @a mount_h handler will be used to mount a file system of this @a type.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occured. The @c errno indicates the error.
+ */
+int rtems_filesystem_register(
+ const char *type,
+ rtems_filesystem_fsmount_me_t mount_h
+);
+
+/**
+ * @brief Unregisters a file system @a type.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occured. The @c errno indicates the error.
+ */
+int rtems_filesystem_unregister(
+ const char *type
+);
+
+/**
+ * @brief Unmounts the file system at @a mount_path.
+ *
+ * @todo Due to file system implementation shortcomings it is possible to
+ * unmount file systems in use. This likely leads to heap corruption. Unmount
+ * only file systems which are not in use by the application.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occured. The @c errno indicates the error.
+ */
int unmount(
const char *mount_path
);
+/**
+ * @brief Mounts a file system at @a target.
+ *
+ * The @a source may be a path to the corresponding device file, or @c NULL.
+ * The @a target path must lead to an existing directory, or @c NULL. In case
+ * @a target is @c NULL, the root file system will be mounted. The @a data
+ * parameter will be forwarded to the file system initialization handler. The
+ * file system type is selected by @a filesystemtype and may be one of
+ * - RTEMS_FILESYSTEM_TYPE_DEVFS,
+ * - RTEMS_FILESYSTEM_TYPE_DOSFS,
+ * - RTEMS_FILESYSTEM_TYPE_FTPFS,
+ * - RTEMS_FILESYSTEM_TYPE_IMFS,
+ * - RTEMS_FILESYSTEM_TYPE_MINIIMFS,
+ * - RTEMS_FILESYSTEM_TYPE_NFS,
+ * - RTEMS_FILESYSTEM_TYPE_RFS, or
+ * - RTEMS_FILESYSTEM_TYPE_TFTPFS.
+ *
+ * Only configured or registered file system types are available. You can add
+ * file system types to your application configuration with
+ * - CONFIGURE_FILESYSTEM_DEVFS,
+ * - CONFIGURE_FILESYSTEM_DOSFS,
+ * - CONFIGURE_FILESYSTEM_FTPFS,
+ * - CONFIGURE_FILESYSTEM_IMFS,
+ * - CONFIGURE_FILESYSTEM_MINIIMFS,
+ * - CONFIGURE_FILESYSTEM_NFS,
+ * - CONFIGURE_FILESYSTEM_RFS, and
+ * - CONFIGURE_FILESYSTEM_TFTPFS.
+ *
+ * @see rtems_filesystem_register() and mount_and_make_target_path().
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occured. The @c errno indicates the error.
+ */
int mount(
const char *source,
const char *target,
@@ -1448,10 +1474,72 @@
const void *data
);
-/*
- * Boot Time Mount Table Structure
+/**
+ * @brief Per file system type routine.
+ *
+ * @see rtems_filesystem_iterate().
+ *
+ * @retval true Stop the iteration.
+ * @retval false Continue the iteration.
+ */
+typedef bool (*rtems_per_filesystem_routine)(
+ const rtems_filesystem_table_t *fs_entry,
+ void *arg
+);
+
+/**
+ * @brief Iterates over all file system types.
+ *
+ * For each file system type the @a routine will be called with the entry and
+ * the @a routine_arg parameter.
+ *
+ * Do not register or unregister file system types in @a routine.
+ *
+ * The iteration is protected by the IO library mutex.
+ *
+ * @retval true Iteration stopped due to @a routine return status.
+ * @retval false Iteration through all entries.
*/
+bool rtems_filesystem_iterate(
+ rtems_per_filesystem_routine routine,
+ void *routine_arg
+);
+/**
+ * @brief Per file system mount routine.
+ *
+ * @see rtems_filesystem_mount_iterate().
+ *
+ * @retval true Stop the iteration.
+ * @retval false Continue the iteration.
+ */
+typedef bool (*rtems_per_filesystem_mount_routine)(
+ const rtems_filesystem_mount_table_entry_t *mt_entry,
+ void *arg
+);
+
+/**
+ * @brief Iterates over all file system mounts.
+ *
+ * For each file system mount the @a routine will be called with the entry and
+ * the @a routine_arg parameter.
+ *
+ * Do not mount or unmount file systems in @a routine.
+ *
+ * The iteration is protected by the IO library mutex.
+ *
+ * @retval true Iteration stopped due to @a routine return status.
+ * @retval false Iteration through all entries.
+ */
+bool
+rtems_filesystem_mount_iterate(
+ rtems_per_filesystem_mount_routine routine,
+ void *routine_arg
+);
+
+/**
+ * @brief Boot time mount table entry.
+ */
typedef struct {
const char *type;
rtems_filesystem_options_t fsoptions;
@@ -1459,30 +1547,19 @@
const char *mount_point;
} rtems_filesystem_mount_table_t;
+/**
+ * @brief Boot time mount table.
+ *
+ * @todo Only the first entry will be evaluated. Why do we need a table?
+ */
extern const rtems_filesystem_mount_table_t *rtems_filesystem_mount_table;
-extern const int rtems_filesystem_mount_table_size;
-
-typedef void (*rtems_libio_init_functions_t)(void);
-extern rtems_libio_init_functions_t rtems_libio_init_helper;
-
-void open_dev_console(void);
-
-typedef void (*rtems_libio_supp_functions_t)(void);
-extern rtems_libio_supp_functions_t rtems_libio_supp_helper;
-
-typedef void (*rtems_fs_init_functions_t)(void);
-extern rtems_fs_init_functions_t rtems_fs_init_helper;
/**
- * @brief Creates a directory and all its parent directories according to
- * @a path.
- *
- * The @a mode value selects the access permissions of the directory.
+ * @brief Boot time mount table entry count.
*
- * @retval 0 Successful operation.
- * @retval -1 An error occured. The @c errno indicates the error.
+ * @todo Only the first entry will be evaluated. Why do we need a table?
*/
-extern int rtems_mkdir(const char *path, mode_t mode);
+extern const int rtems_filesystem_mount_table_size;
/** @} */
@@ -1556,6 +1633,26 @@
/** @} */
+/**
+ * @brief The pathconf setting for a file system.
+ */
+#define rtems_filesystem_pathconf(_mte) ((_mte)->pathconf_limits_and_options)
+
+/**
+ * @brief The type of file system. Its name.
+ */
+#define rtems_filesystem_type(_mte) ((_mte)->type)
+
+/**
+ * @brief The mount point of a file system.
+ */
+#define rtems_filesystem_mount_point(_mte) ((_mte)->target)
+
+/**
+ * @brief The device entry of a file system.
+ */
+#define rtems_filesystem_mount_device(_mte) ((_mte)->dev)
+
#ifdef __cplusplus
}
#endif
diff -u rtems/cpukit/libcsupport/include/rtems/libio_.h:1.38 rtems/cpukit/libcsupport/include/rtems/libio_.h:1.39
--- rtems/cpukit/libcsupport/include/rtems/libio_.h:1.38 Tue Jun 22 15:03:41 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio_.h Thu Jul 1 08:05:18 2010
@@ -40,11 +40,6 @@
extern const rtems_filesystem_file_handlers_r rtems_filesystem_null_handlers;
/*
- * Mount table list.
- */
-extern rtems_chain_control rtems_filesystem_mount_table_control;
-
-/*
* File descriptor Table Information
*/
diff -u rtems/cpukit/libcsupport/src/mount-mgr.c:1.3 rtems/cpukit/libcsupport/src/mount-mgr.c:1.4
--- rtems/cpukit/libcsupport/src/mount-mgr.c:1.3 Mon Jun 7 10:35:24 2010
+++ rtems/cpukit/libcsupport/src/mount-mgr.c Thu Jul 1 08:05:17 2010
@@ -37,38 +37,37 @@
rtems_filesystem_table_t entry;
} filesystem_node;
-RTEMS_CHAIN_DEFINE_EMPTY(filesystem_chain);
+static RTEMS_CHAIN_DEFINE_EMPTY(filesystem_chain);
-void
-rtems_filesystem_iterate(
+bool rtems_filesystem_iterate(
rtems_per_filesystem_routine routine,
void *routine_arg
)
{
const rtems_filesystem_table_t *table_entry = &rtems_filesystem_table [0];
rtems_chain_node *node = NULL;
+ bool stop = false;
- while ( table_entry->type ) {
- if ( !(*routine)( table_entry, routine_arg ) ) {
- break;
- }
-
+ while ( table_entry->type && !stop ) {
+ stop = (*routine)( table_entry, routine_arg );
++table_entry;
}
- rtems_libio_lock();
- for (
- node = rtems_chain_first( &filesystem_chain );
- !rtems_chain_is_tail( &filesystem_chain, node );
- node = rtems_chain_next( node )
- ) {
- const filesystem_node *fsn = (filesystem_node *) node;
+ if ( !stop ) {
+ rtems_libio_lock();
+ for (
+ node = rtems_chain_first( &filesystem_chain );
+ !rtems_chain_is_tail( &filesystem_chain, node ) && !stop;
+ node = rtems_chain_next( node )
+ ) {
+ const filesystem_node *fsn = (filesystem_node *) node;
- if ( !(*routine)( &fsn->entry, routine_arg ) ) {
- break;
+ stop = (*routine)( &fsn->entry, routine_arg );
}
+ rtems_libio_unlock();
}
- rtems_libio_unlock();
+
+ return stop;
}
typedef struct {
@@ -81,7 +80,7 @@
find_arg *fa = arg;
if ( strcmp( entry->type, fa->type ) != 0 ) {
- return true;
+ return false;
} else {
fa->mount_h = entry->mount_h;
diff -u rtems/cpukit/libcsupport/src/mount.c:1.37 rtems/cpukit/libcsupport/src/mount.c:1.38
--- rtems/cpukit/libcsupport/src/mount.c:1.37 Tue Jun 22 09:20:49 2010
+++ rtems/cpukit/libcsupport/src/mount.c Thu Jul 1 08:05:17 2010
@@ -36,10 +36,7 @@
#include <rtems/libio_.h>
-/*
- * Mount table list.
- */
-RTEMS_CHAIN_DEFINE_EMPTY(rtems_filesystem_mount_table_control);
+static RTEMS_CHAIN_DEFINE_EMPTY(mount_chain);
/*
* Default pathconfs.
@@ -59,37 +56,12 @@
0 /* posix_vdisable: special char processing, 0=no, 1=yes */
};
-/*
- * Is_node_fs_root
- *
- * This routine will run through the entries that currently exist in the
- * mount table chain. For each entry in the mount table chain it will
- * compare the mount tables root node to the node describing the selected
- * mount point. If any match is found true is returned else false is
- * returned.
- *
- */
-
-static bool Is_node_fs_root(
- rtems_filesystem_location_info_t *loc
+static bool is_node_fs_root(
+ const rtems_filesystem_mount_table_entry_t *mt_entry,
+ void *arg
)
{
- rtems_chain_node *node = NULL;
-
- /*
- * For each mount table entry
- */
- for ( node = rtems_chain_first( &rtems_filesystem_mount_table_control );
- !rtems_chain_is_tail( &rtems_filesystem_mount_table_control, node );
- node = rtems_chain_next( node ) ) {
- rtems_filesystem_mount_table_entry_t *mount_table_entry =
- (rtems_filesystem_mount_table_entry_t *) node;
-
- if ( mount_table_entry->mt_fs_root.node_access == loc->node_access )
- return true;
- }
-
- return false;
+ return arg == mt_entry->mt_fs_root.node_access;
}
static rtems_filesystem_mount_table_entry_t *alloc_mount_table_entry(
@@ -225,7 +197,7 @@
* You can only mount one file system onto a single mount point.
*/
- if ( Is_node_fs_root( &loc ) ){
+ if ( rtems_filesystem_mount_iterate( is_node_fs_root, loc.node_access ) ) {
errno = EBUSY;
goto cleanup_and_bail;
}
@@ -260,7 +232,7 @@
/*
* Do we already have a base file system ?
*/
- if ( !rtems_chain_is_empty( &rtems_filesystem_mount_table_control ) ) {
+ if ( !rtems_chain_is_empty( &mount_chain ) ) {
errno = EINVAL;
goto cleanup_and_bail;
}
@@ -285,8 +257,9 @@
/*
* Add the mount table entry to the mount table chain
*/
- rtems_chain_append( &rtems_filesystem_mount_table_control,
- &mt_entry->Node );
+ rtems_libio_lock();
+ rtems_chain_append( &mount_chain, &mt_entry->Node );
+ rtems_libio_unlock();
if ( !has_target )
rtems_filesystem_root = mt_entry->mt_fs_root;
@@ -303,33 +276,26 @@
return -1;
}
-/*
- * Get the first entry in the mount table.
- */
-rtems_filesystem_mount_table_entry_t *
-rtems_filesystem_mounts_first(
- void
+bool rtems_filesystem_mount_iterate(
+ rtems_per_filesystem_mount_routine routine,
+ void *routine_arg
)
{
- rtems_filesystem_mount_table_entry_t *entry = NULL;
+ rtems_chain_node *node = NULL;
+ bool stop = false;
- 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 );
+ rtems_libio_lock();
+ for (
+ node = rtems_chain_first( &mount_chain );
+ !rtems_chain_is_tail( &mount_chain, node ) && !stop;
+ node = rtems_chain_next( node )
+ ) {
+ const rtems_filesystem_mount_table_entry_t *mt_entry =
+ (rtems_filesystem_mount_table_entry_t *) node;
- return entry;
-}
+ stop = (*routine)( mt_entry, routine_arg );
+ }
+ rtems_libio_unlock();
-/*
- * 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 ( !entry )
- return NULL;
- return (rtems_filesystem_mount_table_entry_t *)
- rtems_chain_next( &entry->Node );
+ return stop;
}
diff -u rtems/cpukit/libcsupport/src/statvfs.c:1.2 rtems/cpukit/libcsupport/src/statvfs.c:1.3
--- rtems/cpukit/libcsupport/src/statvfs.c:1.2 Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libcsupport/src/statvfs.c Thu Jul 1 08:05:18 2010
@@ -21,11 +21,6 @@
#include <sys/statvfs.h>
-/*
- * Data structures and routines private to mount/unmount pair.
- */
-extern rtems_chain_control rtems_filesystem_mount_table_control;
-
int
statvfs (const char *path, struct statvfs *sb)
{
diff -u rtems/cpukit/libcsupport/src/unmount.c:1.26 rtems/cpukit/libcsupport/src/unmount.c:1.27
--- rtems/cpukit/libcsupport/src/unmount.c:1.26 Thu Jun 10 05:12:28 2010
+++ rtems/cpukit/libcsupport/src/unmount.c Thu Jul 1 08:05:18 2010
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <rtems/chain.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -32,51 +31,14 @@
#include <rtems/libio_.h>
#include <rtems/seterr.h>
+#include <rtems/chain.h>
-bool rtems_filesystem_nodes_equal(
- const rtems_filesystem_location_info_t *loc1,
- const rtems_filesystem_location_info_t *loc2
-){
- return ( loc1->node_access == loc2->node_access );
-}
-
-
-/*
- * file_systems_below_this_mountpoint
- *
- * This routine will run through the entries that currently exist in the
- * mount table chain. For each entry in the mount table chain it will
- * compare the mount tables mt_fs_root to the new_fs_root_node. If any of the
- * mount table file system root nodes matches the new file system root node
- * this indicates that we are trying to mount a file system that has already
- * been mounted. This is not a permitted operation. temp_loc is set to
- * the root node of the file system being unmounted.
- */
-
-bool file_systems_below_this_mountpoint(
- const char *path __attribute__((unused)),
- rtems_filesystem_location_info_t *fs_root_loc,
- rtems_filesystem_mount_table_entry_t *fs_to_unmount __attribute__((unused))
+static bool is_fs_below_mount_point(
+ const rtems_filesystem_mount_table_entry_t *mt_entry,
+ void *arg
)
{
- rtems_chain_node *the_node;
- rtems_filesystem_mount_table_entry_t *the_mount_entry;
-
- /*
- * Search the mount table for any mount entries referencing this
- * mount entry.
- */
-
- for ( the_node = rtems_filesystem_mount_table_control.first;
- !rtems_chain_is_tail( &rtems_filesystem_mount_table_control, the_node );
- the_node = the_node->next ) {
- the_mount_entry = ( rtems_filesystem_mount_table_entry_t * )the_node;
- if (the_mount_entry->mt_point_node.mt_entry == fs_root_loc->mt_entry ) {
- return true;
- }
- }
-
- return false;
+ return arg == mt_entry->mt_point_node.mt_entry;
}
/*
@@ -114,7 +76,7 @@
* Verify this is the root node for the file system to be unmounted.
*/
- if ( !rtems_filesystem_nodes_equal( fs_root_loc, &loc) ){
+ if ( fs_root_loc->node_access != loc.node_access ){
rtems_filesystem_freenode( &loc );
rtems_set_errno_and_return_minus_one( EACCES );
}
@@ -151,7 +113,8 @@
* Verify there are no file systems below the path specified
*/
- if ( file_systems_below_this_mountpoint( path, fs_root_loc, mt_entry ) != 0 )
+ if ( rtems_filesystem_mount_iterate( is_fs_below_mount_point,
+ fs_root_loc->mt_entry ) )
rtems_set_errno_and_return_minus_one( EBUSY );
/*
@@ -195,7 +158,9 @@
* Extract the mount table entry from the chain
*/
- rtems_chain_extract( ( rtems_chain_node * ) mt_entry );
+ rtems_libio_lock();
+ rtems_chain_extract( &mt_entry->Node );
+ rtems_libio_unlock();
/*
* Free the memory node that was allocated in mount
diff -u rtems/cpukit/libmisc/shell/main_mount.c:1.9 rtems/cpukit/libmisc/shell/main_mount.c:1.10
--- rtems/cpukit/libmisc/shell/main_mount.c:1.9 Mon Jun 7 10:35:24 2010
+++ rtems/cpukit/libmisc/shell/main_mount.c Thu Jul 1 08:05:18 2010
@@ -31,7 +31,7 @@
{
printf("%s ", entry->type);
- return true;
+ return false;
}
int rtems_shell_main_mount(
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100701/d1454504/attachment.html>
More information about the vc
mailing list