4 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/libfs/src/dosfs/fat_file.c b/cpukit/libfs/src/dosfs/fat_file.c
index 7ca662232b..9a3ad6677e 100644
--- a/cpukit/libfs/src/dosfs/fat_file.c
+++ b/cpukit/libfs/src/dosfs/fat_file.c
@@ -926,7 +926,7 @@ _hash_search(
     )
 {
     uint32_t          mod = (key1) % FAT_HASH_MODULE;
-    rtems_chain_node *the_node = ((rtems_chain_control *)((hash) + mod))->first;
+    rtems_chain_node *the_node = rtems_chain_first(hash + mod);
 
     for ( ; !rtems_chain_is_tail((hash) + mod, the_node) ; )
     {
diff --git a/cpukit/libfs/src/imfs/imfs_debug.c b/cpukit/libfs/src/imfs/imfs_debug.c
index 5b95a17c6a..0a4e3a9bba 100644
--- a/cpukit/libfs/src/imfs/imfs_debug.c
+++ b/cpukit/libfs/src/imfs/imfs_debug.c
@@ -114,7 +114,7 @@ void IMFS_dump_directory(
 
   the_chain = &the_directory->info.directory.Entries;
 
-  for ( the_node = the_chain->first;
+  for ( the_node = rtems_chain_first( the_chain );
         !rtems_chain_is_tail( the_chain, the_node );
         the_node = the_node->next ) {
 
diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c
index 6381c7b18a..46ff335e59 100644
--- a/cpukit/libfs/src/imfs/imfs_directory.c
+++ b/cpukit/libfs/src/imfs/imfs_directory.c
@@ -97,7 +97,7 @@ ssize_t imfs_dir_read(
       return 0;
 
    /* Move to the first of the desired directory entries */
-   the_node = the_chain->first;
+   the_node = rtems_chain_first( the_chain );
 
    bytes_transferred = 0;
    first_entry = iop->offset;
@@ -263,7 +263,7 @@ int imfs_dir_fstat(
 
    /* Run through the chain and count the number of directory entries */
    /* that are subordinate to this directory node                     */
-   for ( the_node = the_chain->first ;
+   for ( the_node = rtems_chain_first( the_chain );
          !rtems_chain_is_tail( the_chain, the_node ) ;
          the_node = the_node->next ) {
 
diff --git a/cpukit/libfs/src/imfs/imfs_getchild.c b/cpukit/libfs/src/imfs/imfs_getchild.c
index dfec017643..1cfeb2a537 100644
--- a/cpukit/libfs/src/imfs/imfs_getchild.c
+++ b/cpukit/libfs/src/imfs/imfs_getchild.c
@@ -52,7 +52,7 @@ IMFS_jnode_t *IMFS_find_match_in_dir(
 
   the_chain = &directory->info.directory.Entries;
 
-  for ( the_node = the_chain->first;
+  for ( the_node = rtems_chain_first( the_chain );
         !rtems_chain_is_tail( the_chain, the_node );
         the_node = the_node->next ) {