Changeset 0c2241c in rtems

Timestamp:

10/10/17 23:11:49 (6 years ago)

Author:

Fan Deng <enetor@…>

Branches:

5, master

Children:

095a807

Parents:

343f2084

git-author:

Fan Deng <enetor@…> (10/10/17 23:11:49)

git-committer:

Chris Johns <chrisj@…> (04/11/18 01:51:57)

Message:

Make bit addressing consistent in rtems_rfs_group.c

This change fixes ​https://devel.rtems.org/ticket/3089.

Briefly, rtems_rfs_group.c contains conflicting conversions between
block numbers and group number and bit offset pairs. This caused the
actual bit stored on the bitmask to be one bit displaced from its
intended location.

For more details, please see the associated ticket.

Tested by inspecting the written bitmasks with and without this change.

File:

• cpukit/libfs/src/rfs/rtems-rfs-group.c (modified) (2 diffs)

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

@@ -168 +168 @@
   }
   else
+  {
     size = fs->group_blocks;
+    /*
+     * It is possible for 'goal' to be zero. Any newly created inode will have
+     * its 'last_data_block' set to zero, which is then used as 'goal' to
+     * allocate new blocks. When that happens, we simply set 'goal' to zero and
+     * continue the search from there.
+     */
+    if (goal >= RTEMS_RFS_ROOT_INO)
+        goal -= RTEMS_RFS_ROOT_INO;
+  }
 
   group_start = goal / size;
@@ -325 +335 @@
   else
   {
-    if (no >= rtems_rfs_fs_blocks (fs))
+    if ((no < RTEMS_RFS_ROOT_INO) || (no >= rtems_rfs_fs_blocks (fs)))
         return EINVAL;
+    no -= RTEMS_RFS_ROOT_INO;
     size = fs->group_blocks;
   }