Changeset 5d2ae6e2 in rtems

Timestamp:

04/25/14 07:30:37 (9 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.11, 5, master

Children:

e306f3df

Parents:

c9a0a10

Message:

libfs/rfs: Fix the fstime failures for the RFS file system.

Location:

cpukit/libfs/src/rfs

Files:

• rtems-rfs-file.c (modified) (8 diffs)
• rtems-rfs-inode.c (modified) (2 diffs)

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

@@ -353 +353 @@
 
   length = false;
-  mtime = false;
+  mtime = !read;
 
   if (!read &&
@@ -362 +362 @@
                                          handle->bpos.boff);
     length = true;
-    mtime = true;
   }
 
@@ -426 +425 @@
   {
     rtems_rfs_file_set_bpos (handle, pos);
-    
+
     /*
      * If the file has a block check if it maps to the current position and it
@@ -436 +435 @@
       rtems_rfs_buffer_block block;
       int                    rc;
-      
+
       rc = rtems_rfs_block_map_find (rtems_rfs_file_fs (handle),
                                      rtems_rfs_file_map (handle),
@@ -444 +443 @@
         return rc;
       if (rtems_rfs_buffer_bnum (&handle->buffer) != block)
-      {        
+      {
         rc = rtems_rfs_buffer_handle_release (rtems_rfs_file_fs (handle),
                                               rtems_rfs_file_buffer (handle));
@@ -462 +461 @@
       return rc;
   }
-  
+
   *new_pos = pos;
   return 0;
@@ -479 +478 @@
 
   size = rtems_rfs_file_size (handle);
-  
+
   /*
    * If the file is same size do nothing else grow or shrink it ?
@@ -609 +608 @@
     handle->shared->size.count  = rtems_rfs_block_map_count (map);
     handle->shared->size.offset = rtems_rfs_block_map_size_offset (map);
-
-    if (rtems_rfs_file_update_mtime (handle))
-      handle->shared->mtime = time (NULL);
-  }
-  
+  }
+
+  if (rtems_rfs_file_update_mtime (handle))
+    handle->shared->mtime = time (NULL);
+
   return 0;
 }

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

@@ -4 +4 @@
  * @brief RTEMS File Systems Inode Routines
  * @ingroup rtems_rfs
- * 
+ *
  * These functions manage inodes in the RFS file system. An inode is part of a
  * block that reside after the bitmaps in the group.
@@ -286 +286 @@
     rtems_rfs_inode_set_links (&parent_inode,
                                rtems_rfs_inode_get_links (&parent_inode) + 1);
+
+  /*
+   * Update the parent's mtime.
+   */
+  rc = rtems_rfs_inode_time_stamp_now (&parent_inode, true, true);
+  if (rc > 0)
+  {
+    rtems_rfs_inode_delete (fs, &inode);
+    rtems_rfs_inode_close (fs, &inode);
+    return rc;
+  }
 
   rc = rtems_rfs_inode_close (fs, &parent_inode);