Changeset 313 for trunk/kernel/vfs/vfs.c

Timestamp:

Aug 2, 2017, 3:24:57 PM (6 years ago)

Author:

alain

Message:

RSeveral modifs in the page-fault handling.

File:

• trunk/kernel/vfs/vfs.c (modified) (3 diffs)

trunk/kernel/vfs/vfs.c

@@ -662 +662 @@
 }  // end vfs_open()
 
-/////////////////////////////////////
-error_t vfs_move( bool_t   to_buffer,
-                  bool_t   is_user,
-                  xptr_t   file_xp,
-                  void   * buffer,
-                  uint32_t size )
+//////////////////////////////////////////
+error_t vfs_user_move( bool_t   to_buffer,
+                       xptr_t   file_xp,
+                       void   * buffer,
+                       uint32_t size )
 {
     assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
@@ -695 +694 @@
         if( file_cxy == local_cxy )
         {
-            error = mapper_move_buffer( mapper,
-                                        to_buffer,
-                                        is_user,
-                                        file_offset,
-                                        buffer,
-                                        size );
+            error = mapper_move_user( mapper,
+                                      to_buffer,
+                                      file_offset,
+                                      buffer,
+                                      size );
         }
         else
         {
-            rpc_mapper_move_buffer_client( file_cxy,
-                                           mapper,
-                                           to_buffer,
-                                           is_user,
-                                           file_offset,
-                                           buffer,
-                                           size,
-                                           &error );
+            rpc_mapper_move_user_client( file_cxy,
+                                         mapper,
+                                         to_buffer,
+                                         true,          // user buffer
+                                         file_offset,
+                                         (uint64_t)(intptr_t)buffer,
+                                         size,
+                                         &error );
         } 
 
@@ -722 +720 @@
         return -1;
     }
-}  // end vfs_move()
+}  // end vfs_user_move()
 
 //////////////////////////////////////