The patch to the 4.10 branch did not apply correctly. This fixes it.

10 files changed, 68 insertions, 79 deletions

diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.c b/cpukit/libfs/src/rfs/rtems-rfs-block.c
index 342d738f22..776c7f314d 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-block.c
@@ -58,20 +58,7 @@ rtems_rfs_pos
 rtems_rfs_block_get_pos (rtems_rfs_file_system* fs,
                          rtems_rfs_block_pos*   bpos)
 {
-#if 0
-  rtems_rfs_pos pos = 0;
-  if (bpos->bno)
-  {
-    pos = bpos->boff;
-    if (pos == 0)
-      pos = rtems_rfs_fs_block_size (fs);
-    pos += (bpos->bno - 1) * rtems_rfs_fs_block_size (fs);
-  }
-#else
-  rtems_rfs_pos pos;
-  pos = (bpos->bno * rtems_rfs_fs_block_size (fs)) + bpos->boff;
-#endif
-  return pos;
+  return (bpos->bno * rtems_rfs_fs_block_size (fs)) + bpos->boff;
 }
 
 void
@@ -639,8 +626,6 @@ rtems_rfs_block_map_indirect_shrink (rtems_rfs_file_system*   fs,
       int b;
       for (b = 0; b < RTEMS_RFS_INODE_BLOCKS; b++)
         map->blocks[b] = rtems_rfs_block_get_number (buffer, b);
-
-      rtems_rfs_buffer_handle_reset (buffer);
     }
     else
     {
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
index ccfc0ea887..e207f5c7d3 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
+++ b/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
@@ -186,22 +186,6 @@ int rtems_rfs_buffer_handle_release (rtems_rfs_file_system*   fs,
                                      rtems_rfs_buffer_handle* handle);
 
 /**
- * Reset a handle.
- *
- * @param fs The file system data.
- * @param handle The buffer handle to reset.
- * @return int The error number (errno). No error if 0.
- */
-static inline int
-rtems_rfs_buffer_handle_reset (rtems_rfs_buffer_handle* handle)
-{
-  handle->dirty = false;
-  handle->bnum  = 0; 
-  handle->buffer = NULL;
-  return 0;
-}
-
-/**
  * Open a handle.
  *
  * @param fs The file system data.
@@ -212,7 +196,9 @@ static inline int
 rtems_rfs_buffer_handle_open (rtems_rfs_file_system*   fs,
                               rtems_rfs_buffer_handle* handle)
 {
-  rtems_rfs_buffer_handle_reset (handle);
+  handle->dirty = false;
+  handle->bnum  = 0; 
+  handle->buffer = NULL;
   return 0;
 }
 
@@ -228,6 +214,9 @@ rtems_rfs_buffer_handle_close (rtems_rfs_file_system*   fs,
                                rtems_rfs_buffer_handle* handle)
 {
   rtems_rfs_buffer_handle_release (fs, handle);
+  handle->dirty = false;
+  handle->bnum  = 0; 
+  handle->buffer = NULL;
   return 0;
 }
 
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.c b/cpukit/libfs/src/rfs/rtems-rfs-dir.c
index 7b44824f90..1f2e5fd518 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-dir.c
@@ -620,10 +620,7 @@ rtems_rfs_dir_read (rtems_rfs_file_system*  fs,
       if (remaining <= RTEMS_RFS_DIR_ENTRY_SIZE)
         *length += remaining;
       
-      if (elength < RTEMS_RFS_DIR_ENTRY_SIZE)
-        elength = 0;
-      else
-        elength -= RTEMS_RFS_DIR_ENTRY_SIZE;
+      elength -= RTEMS_RFS_DIR_ENTRY_SIZE;
       if (elength > NAME_MAX)
         elength = NAME_MAX;
       
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.c b/cpukit/libfs/src/rfs/rtems-rfs-format.c
index e92228f4da..8199466bfb 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-format.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-format.c
@@ -84,8 +84,7 @@ rtems_rfs_inode_overhead (rtems_rfs_file_system* fs)
                                   rtems_rfs_fs_block_size (fs));
   bits_per_block = rtems_rfs_bits_per_block (fs);
   /*
-   * There could be more bits that there are blocks, eg 512K disk with 512
-   * blocks.
+   * There could be more bits than blocks, eg 512K disk with 512 blocks.
    */
   if (bits_per_block > (rtems_rfs_fs_blocks (fs) - RTEMS_RFS_SUPERBLOCK_SIZE))
     bits_per_block = rtems_rfs_fs_blocks (fs) - RTEMS_RFS_SUPERBLOCK_SIZE;
@@ -353,7 +352,7 @@ rtems_rfs_write_group (rtems_rfs_file_system* fs,
   rtems_rfs_buffer_mark_dirty (&handle);
 
   /*
-   * Initialise the inode tables if rerquired to do so.
+   * Initialise the inode tables if required to do so.
    */
   if (initialise_inodes)
   {
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.c b/cpukit/libfs/src/rfs/rtems-rfs-group.c
index 40901bb1bf..a6c2fce1ba 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-group.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-group.c
@@ -46,6 +46,15 @@ rtems_rfs_group_open (rtems_rfs_file_system* fs,
 
   if ((base + size) >= rtems_rfs_fs_blocks (fs))
     size = rtems_rfs_fs_blocks (fs) - base;
+
+  /*
+   * Limit the inodes to the same size as the blocks. This is what the
+   * format does and if this is not done the accounting of inodes does
+   * not work. If we are so pushed for inodes that this makes a difference
+   * the format configuration needs reviewing.
+   */
+  if (inodes > size)
+    inodes = size;
   
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_OPEN))
     printf ("rtems-rfs: group-open: base=%" PRId32 ", blocks=%zd inodes=%zd\n",
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.c b/cpukit/libfs/src/rfs/rtems-rfs-inode.c
index 030ee82102..608048e84b 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-inode.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-inode.c
@@ -296,6 +296,12 @@ rtems_rfs_inode_delete (rtems_rfs_file_system*  fs,
                         rtems_rfs_inode_handle* handle)
 {
   int rc = 0;
+  
+  if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_DELETE))
+    printf("rtems-rfs: inode-delete: ino:%" PRIu32 " loaded:%s\n",
+           rtems_rfs_inode_ino (handle),
+           rtems_rfs_inode_is_loaded (handle) ? "yes" : "no");
+
   if (rtems_rfs_inode_is_loaded (handle))
   {
     rtems_rfs_block_map map;
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c
index 452e1b6b3c..8a8dcbe14a 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c
@@ -26,6 +26,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include <rtems/rfs/rtems-rfs-dir.h>
 #include <rtems/rfs/rtems-rfs-link.h>
@@ -113,7 +114,7 @@ rtems_rfs_rtems_dir_read (rtems_libio_t* iop,
   rtems_rfs_ino          ino = rtems_rfs_rtems_get_iop_ino (iop);
   rtems_rfs_inode_handle inode;
   struct dirent*         dirent;
-  size_t                 bytes_transfered;
+  ssize_t                bytes_transferred;
   int                    d;
   int                    rc;
 
@@ -129,7 +130,7 @@ rtems_rfs_rtems_dir_read (rtems_libio_t* iop,
     return rtems_rfs_rtems_error ("dir_read: read inode", rc);
   }
 
-  bytes_transfered = 0;
+  bytes_transferred = 0;
   
   for (d = 0; d < count; d++, dirent++)
   {
@@ -142,17 +143,17 @@ rtems_rfs_rtems_dir_read (rtems_libio_t* iop,
     }
     if (rc > 0)
     {
-      bytes_transfered = rtems_rfs_rtems_error ("dir_read: dir read", rc);
+      bytes_transferred = rtems_rfs_rtems_error ("dir_read: dir read", rc);
       break;
     }
     iop->offset += size;
-    bytes_transfered += sizeof (struct dirent);
+    bytes_transferred += sizeof (struct dirent);
   }
 
   rtems_rfs_inode_close (fs, &inode);
   rtems_rfs_rtems_unlock (fs);
   
-  return (ssize_t) bytes_transfered;
+  return bytes_transferred;
 }
 
 /**
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.c b/cpukit/libfs/src/rfs/rtems-rfs-shell.c
index a11b68cecf..63931752cf 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-shell.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-shell.c
@@ -123,24 +123,24 @@ rtems_rfs_shell_data (rtems_rfs_file_system* fs, int argc, char *argv[])
   printf ("RFS Filesystem Data\n");
   printf ("             flags: %08" PRIx32 "\n", fs->flags);
 #if 0
-  printf ("            device: %08lx\n", rtems_rfs_fs_device (fs));
+  printf ("            device: %08lx\n",         rtems_rfs_fs_device (fs));
 #endif
-  printf ("            blocks: %zu\n",  rtems_rfs_fs_blocks (fs));
-  printf ("        block size: %zu\n",  rtems_rfs_fs_block_size (fs));
-  printf ("              size: %" PRIu64 "\n",  rtems_rfs_fs_size (fs));
-  printf ("  media block size: %" PRIu32 "\n",  rtems_rfs_fs_media_block_size (fs));
-  printf ("        media size: %" PRIu64 "\n", rtems_rfs_fs_media_size (fs));
-  printf ("            inodes: %" PRIu32 "\n",  rtems_rfs_fs_inodes (fs));
-  printf ("        bad blocks: %" PRIu32 "\n",  fs->bad_blocks);
-  printf ("  max. name length: %" PRIu32 "\n",  rtems_rfs_fs_max_name (fs));
-  printf ("            groups: %d\n",   fs->group_count);
-  printf ("      group blocks: %zd\n",  fs->group_blocks);
-  printf ("      group inodes: %zd\n",  fs->group_inodes);
-  printf ("  inodes per block: %zd\n",  fs->inodes_per_block);
-  printf ("  blocks per block: %zd\n",  fs->blocks_per_block);
-  printf ("     singly blocks: %zd\n",  fs->block_map_singly_blocks);
-  printf ("    doublly blocks: %zd\n",  fs->block_map_doubly_blocks);
-  printf (" max. held buffers: %" PRId32 "\n",  fs->max_held_buffers);
+  printf ("            blocks: %zu\n",           rtems_rfs_fs_blocks (fs));
+  printf ("        block size: %zu\n",           rtems_rfs_fs_block_size (fs));
+  printf ("              size: %" PRIu64 "\n",   rtems_rfs_fs_size (fs));
+  printf ("  media block size: %" PRIu32 "\n",   rtems_rfs_fs_media_block_size (fs));
+  printf ("        media size: %" PRIu64 "\n",   rtems_rfs_fs_media_size (fs));
+  printf ("            inodes: %" PRIu32 "\n",   rtems_rfs_fs_inodes (fs));
+  printf ("        bad blocks: %" PRIu32 "\n",   fs->bad_blocks);
+  printf ("  max. name length: %" PRIu32 "\n",   rtems_rfs_fs_max_name (fs));
+  printf ("            groups: %d\n",            fs->group_count);
+  printf ("      group blocks: %zd\n",           fs->group_blocks);
+  printf ("      group inodes: %zd\n",           fs->group_inodes);
+  printf ("  inodes per block: %zd\n",           fs->inodes_per_block);
+  printf ("  blocks per block: %zd\n",           fs->blocks_per_block);
+  printf ("     singly blocks: %zd\n",           fs->block_map_singly_blocks);
+  printf ("    doublly blocks: %zd\n",           fs->block_map_doubly_blocks);
+  printf (" max. held buffers: %" PRId32 "\n",   fs->max_held_buffers);
 
   rtems_rfs_shell_lock_rfs (fs);
 
@@ -302,8 +302,7 @@ rtems_rfs_shell_inode (rtems_rfs_file_system* fs, int argc, char *argv[])
     }
   }
 
-  if ((start < 0) || (end < 0) ||
-      (start >= total) || (end >= total))
+  if ((start >= total) || (end >= total))
   {
     printf ("error: inode out of range (0->%" PRId32 ").\n", total - 1);
     return 1;
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.c b/cpukit/libfs/src/rfs/rtems-rfs-trace.c
index d85ceba5ee..d96a63673b 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-trace.c
@@ -78,6 +78,7 @@ rtems_rfs_trace_shell_command (int argc, char *argv[])
     "inode-load",
     "inode-unload",
     "inode-create",
+    "inode-delete",
     "link",
     "unlink",
     "dir-lookup-ino",
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/cpukit/libfs/src/rfs/rtems-rfs-trace.h
index 19f46828c4..05d9258c7d 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.h
+++ b/cpukit/libfs/src/rfs/rtems-rfs-trace.h
@@ -28,7 +28,9 @@
 /**
  * Is tracing enabled ?
  */
+#if !defined (RTEMS_RFS_TRACE)
 #define RTEMS_RFS_TRACE 1
+#endif
 
 /**
  * The type of the mask.
@@ -62,21 +64,22 @@ typedef uint64_t rtems_rfs_trace_mask;
 #define RTEMS_RFS_TRACE_INODE_LOAD             (1ULL << 20)
 #define RTEMS_RFS_TRACE_INODE_UNLOAD           (1ULL << 21)
 #define RTEMS_RFS_TRACE_INODE_CREATE           (1ULL << 22)
-#define RTEMS_RFS_TRACE_LINK                   (1ULL << 23)
-#define RTEMS_RFS_TRACE_UNLINK                 (1ULL << 24)
-#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO         (1ULL << 25)
-#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO_CHECK   (1ULL << 26)
-#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO_FOUND   (1ULL << 27)
-#define RTEMS_RFS_TRACE_DIR_ADD_ENTRY          (1ULL << 28)
-#define RTEMS_RFS_TRACE_DIR_DEL_ENTRY          (1ULL << 29)
-#define RTEMS_RFS_TRACE_DIR_READ               (1ULL << 30)
-#define RTEMS_RFS_TRACE_DIR_EMPTY              (1ULL << 31)
-#define RTEMS_RFS_TRACE_SYMLINK                (1ULL << 32)
-#define RTEMS_RFS_TRACE_SYMLINK_READ           (1ULL << 33)
-#define RTEMS_RFS_TRACE_FILE_OPEN              (1ULL << 34)
-#define RTEMS_RFS_TRACE_FILE_CLOSE             (1ULL << 35)
-#define RTEMS_RFS_TRACE_FILE_IO                (1ULL << 36)
-#define RTEMS_RFS_TRACE_FILE_SET               (1ULL << 37)
+#define RTEMS_RFS_TRACE_INODE_DELETE           (1ULL << 23)
+#define RTEMS_RFS_TRACE_LINK                   (1ULL << 24)
+#define RTEMS_RFS_TRACE_UNLINK                 (1ULL << 25)
+#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO         (1ULL << 26)
+#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO_CHECK   (1ULL << 27)
+#define RTEMS_RFS_TRACE_DIR_LOOKUP_INO_FOUND   (1ULL << 28)
+#define RTEMS_RFS_TRACE_DIR_ADD_ENTRY          (1ULL << 29)
+#define RTEMS_RFS_TRACE_DIR_DEL_ENTRY          (1ULL << 30)
+#define RTEMS_RFS_TRACE_DIR_READ               (1ULL << 31)
+#define RTEMS_RFS_TRACE_DIR_EMPTY              (1ULL << 32)
+#define RTEMS_RFS_TRACE_SYMLINK                (1ULL << 33)
+#define RTEMS_RFS_TRACE_SYMLINK_READ           (1ULL << 34)
+#define RTEMS_RFS_TRACE_FILE_OPEN              (1ULL << 35)
+#define RTEMS_RFS_TRACE_FILE_CLOSE             (1ULL << 36)
+#define RTEMS_RFS_TRACE_FILE_IO                (1ULL << 37)
+#define RTEMS_RFS_TRACE_FILE_SET               (1ULL << 38)
 
 /**
  * Call to check if this part is bring traced. If RTEMS_RFS_TRACE is defined to