Changes in uspace/srv/vfs/vfs_file.c [25bef0ff:79ae36dd] in mainline

File:

• uspace/srv/vfs/vfs_file.c (modified) (2 diffs)

uspace/srv/vfs/vfs_file.c

@@ -45 +45 @@
 #include "vfs.h"
 
-#define VFS_DATA        ((vfs_client_data_t *) async_client_data_get())
+#define VFS_DATA        ((vfs_client_data_t *) async_get_client_data())
 #define FILES           (VFS_DATA->files)
 
@@ -110 +110 @@
 static int vfs_file_close_remote(vfs_file_t *file)
 {
+        assert(!file->refcnt);
+        
+        async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle);
+        
         ipc_call_t answer;
-        aid_t msg;
+        aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->devmap_handle,
+            file->node->index, &answer);
+        
+        vfs_exchange_release(exch);
+        
         sysarg_t rc;
-        int phone;
-
-        assert(!file->refcnt);
-
-        phone = vfs_grab_phone(file->node->fs_handle);
-        msg = async_send_2(phone, VFS_OUT_CLOSE, file->node->devmap_handle,
-            file->node->index, &answer);
         async_wait_for(msg, &rc);
-        vfs_release_phone(file->node->fs_handle, phone);
-
+        
         return IPC_GET_ARG1(answer);
 }
-
 
 /** Increment reference count of VFS file structure.