diff options
Diffstat (limited to 'cpukit/libfs/src/rfs/rtems-rfs-block.c')
| -rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-block.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.c b/cpukit/libfs/src/rfs/rtems-rfs-block.c index 5ffadcc284..776c7f314d 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-block.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-block.c @@ -46,33 +46,25 @@ #include <rtems/rfs/rtems-rfs-inode.h> void -rtems_rfs_block_get_bpos (rtems_rfs_file_system* fs, - rtems_rfs_pos pos, - rtems_rfs_block_pos* bpos) +rtems_rfs_block_get_bpos (rtems_rfs_file_system* fs, + rtems_rfs_pos pos, + rtems_rfs_block_pos* bpos) { bpos->bno = pos / rtems_rfs_fs_block_size (fs); bpos->boff = pos % rtems_rfs_fs_block_size (fs); } rtems_rfs_pos -rtems_rfs_block_get_pos (rtems_rfs_file_system* fs, - rtems_rfs_block_pos* bpos) +rtems_rfs_block_get_pos (rtems_rfs_file_system* fs, + rtems_rfs_block_pos* bpos) { - 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); - } - return pos; + return (bpos->bno * rtems_rfs_fs_block_size (fs)) + bpos->boff; } void -rtems_rfs_block_get_block_size (rtems_rfs_file_system* fs, - rtems_rfs_pos pos, - rtems_rfs_block_size* size) +rtems_rfs_block_get_block_size (rtems_rfs_file_system* fs, + rtems_rfs_pos pos, + rtems_rfs_block_size* size) { if (pos == 0) rtems_rfs_block_set_size_zero (size); @@ -634,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 { |