Changeset 97ae192a in rtems

Timestamp:

11/03/11 06:32:42 (12 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.11, 5, master

Children:

6167a5b

Parents:

b009f481

Message:

2011-11-03 Chris Johns <chrisj@…>

PR 1948/filesystem

• libfs/src/rfs/rtems-rfs-file-system.c, libfs/src/rfs/rtems-rfs-file-system.h, libfs/src/rfs/rtems-rfs-format.c, libfs/src/rfs/rtems-rfs-rtems.c: Add support for mount passing an ASCIIZ string containing configuration options. Remove the hardcoded dir string and size. Fix comments.
• libblock/src/bdbuf.c: Fix state labels in trace output.

Location:

cpukit

Files:

• libblock/src/bdbuf.c (modified) (1 diff)
• libfs/src/rfs/rtems-rfs-file-system.c (modified) (2 diffs)
• libfs/src/rfs/rtems-rfs-file-system.h (modified) (2 diffs)
• libfs/src/rfs/rtems-rfs-format.c (modified) (1 diff)
• libfs/src/rfs/rtems-rfs-rtems.c (modified) (10 diffs)

cpukit/libblock/src/bdbuf.c

@@ -291 +291 @@
 {
   const char* states[] =
-    { "EM", "FR", "CH", "AC", "AM", "MD", "SY", "TR" };
+    { "FR", "EM", "CH", "AC", "AM", "MD", "SY", "TR" };
 
   printf ("bdbuf:users: %15s: [%" PRIu32 " (%s)] %td:%td = %" PRIu32 " %s\n",

cpukit/libfs/src/rfs/rtems-rfs-file-system.c

@@ -197 +197 @@
                    void*                   user,
                    uint32_t                flags,
+                   uint32_t                max_held_buffers,
                    rtems_rfs_file_system** fs)
 {
@@ -227 +228 @@
   rtems_chain_initialize_empty (&(*fs)->file_shares);
 
-  (*fs)->max_held_buffers = RTEMS_RFS_FS_MAX_HELD_BUFFERS;
+  (*fs)->max_held_buffers = max_held_buffers;
   (*fs)->buffers_count = 0;
   (*fs)->release_count = 0;

cpukit/libfs/src/rfs/rtems-rfs-file-system.h

@@ -385 +385 @@
  * @param fs The file system data filled in by this call.
  * @param user A pointer to user data.
+ * @param flags The initial set of user flags for the file system.
+ * @param max_held_buffers The maximum number of buffers the RFS holds.
  * @return int The error number (errno). No error if 0.
  */
@@ -390 +392 @@
                        void*                   user,
                        uint32_t                flags,
+                       uint32_t                max_held_buffers,
                        rtems_rfs_file_system** fs);
 

cpukit/libfs/src/rfs/rtems-rfs-format.c

@@ -466 +466 @@
    * External API so returns -1.
    */
-  rc = rtems_rfs_fs_open (name, NULL, RTEMS_RFS_FS_FORCE_OPEN, &fs);
+  rc = rtems_rfs_fs_open (name, NULL,
+                          RTEMS_RFS_FS_FORCE_OPEN | RTEMS_RFS_FS_NO_LOCAL_CACHE,
+                          0, &fs);
   if (rc < 0)
   {

cpukit/libfs/src/rfs/rtems-rfs-rtems.c

@@ -107 +107 @@
     
     /*
-     * Is this the end of the pathname we where given ?
+     * Is this the end of the pathname we were given ?
      */
     if ((*path == '\0') || (pathlen == 0))
@@ -138 +138 @@
 
     /*
-     * Eat any separators at start of the path.
+     * Eat any separators at the start of the path.
      */
     stripped = rtems_filesystem_prefix_separators (path, pathlen);
@@ -147 +147 @@
     /*
      * If the node is the current directory and there is more path to come move
-     * on it else we are at the inode we want.
+     * on to it otherwise we are at the inode we want.
      */
     if (rtems_rfs_current_dir (node))
@@ -167 +167 @@
     {
       /*
-       * If we are at root inode of the file system we have a crossmount path.
+       * If we are at the root inode of the file system we have a crossmount
+       * path.
        */
       if (ino == RTEMS_RFS_ROOT_INO)
@@ -184 +185 @@
        * We need to find the parent of this node.
        */
-      rc = rtems_rfs_dir_lookup_ino (fs, &inode, "..", 2, &ino, &doff);
+      rc = rtems_rfs_dir_lookup_ino (fs, &inode,
+                                     RTEMS_RFS_PARENT_DIR_STR,
+                                     RTEMS_RFS_PARENT_DIR_SIZE, &ino, &doff);
       if (rc > 0)
       {
@@ -309 +312 @@
     
     /*
-     * Is this the end of the pathname we where given ?
+     * Is this the end of the pathname we were given ?
      */
     if (path == *name)
@@ -336 +339 @@
     /*
      * If the node is the current directory and there is more path to come move
-     * on it else we are at the inode we want.
+     * on to it otherwise we are at the inode we want.
      */
     if (rtems_rfs_current_dir (node))
@@ -385 +388 @@
        * We need to find the parent of this node.
        */
-      rc = rtems_rfs_dir_lookup_ino (fs, &inode, "..", 2, &ino, &doff);
+      rc = rtems_rfs_dir_lookup_ino (fs, &inode,
+                                     RTEMS_RFS_PARENT_DIR_STR,
+                                     RTEMS_RFS_PARENT_DIR_SIZE, &ino, &doff);
       if (rc > 0)
       {
@@ -1225 +1230 @@
   rtems_rfs_rtems_private* rtems;
   rtems_rfs_file_system*   fs;
+  uint32_t                 flags = 0;
+  uint32_t                 max_held_buffers = RTEMS_RFS_FS_MAX_HELD_BUFFERS;
+  const char*              options = data;
   int                      rc;
 
+  /*
+   * Parse the options the user specifiies.
+   */
+  while (options)
+  {
+    printf ("options=%s\n", options);
+    if (strncmp (options, "hold-bitmaps",
+                 sizeof ("hold-bitmaps") - 1) == 0)
+      flags |= RTEMS_RFS_FS_BITMAPS_HOLD;
+    else if (strncmp (options, "no-local-cache",
+                      sizeof ("no-local-cache") - 1) == 0)
+      flags |= RTEMS_RFS_FS_NO_LOCAL_CACHE;
+    else if (strncmp (options, "max-held-bufs",
+                      sizeof ("max-held-bufs") - 1) == 0)
+    {
+      max_held_buffers = strtoul (options + sizeof ("max-held-bufs"), 0, 0);
+    }
+    else
+      return rtems_rfs_rtems_error ("initialise: invalid option", EINVAL);
+
+    options = strchr (options, ',');
+    if (options)
+    {
+      ++options;
+      if (*options == '\0')
+        options = NULL;
+    }
+  }
+  
   rtems = malloc (sizeof (rtems_rfs_rtems_private));
   if (!rtems)
@@ -1248 +1285 @@
   }
   
-  rc = rtems_rfs_fs_open (mt_entry->dev, rtems, 0, &fs);
+  rc = rtems_rfs_fs_open (mt_entry->dev, rtems, flags, max_held_buffers, &fs);
   if (rc)
   {