Changeset 41811af in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/srv/vfs/vfs_file.c (modified) (6 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)
 
@@ -79 +79 @@
         for (i = 0; i < MAX_OPEN_FILES; i++) {
                 if (FILES[i]) {
-                        (void) vfs_close_internal(FILES[i]);
                         (void) vfs_fd_free(i);
                 }
@@ -108 +107 @@
 }
 
+/** Close the file in the endpoint FS server. */
+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 = async_send_2(exch, VFS_OUT_CLOSE, file->node->devmap_handle,
+            file->node->index, &answer);
+        
+        vfs_exchange_release(exch);
+        
+        sysarg_t rc;
+        async_wait_for(msg, &rc);
+        
+        return IPC_GET_ARG1(answer);
+}
+
 /** Increment reference count of VFS file structure.
  *
@@ -125 +143 @@
  *                      decremented.
  */
-static void vfs_file_delref(vfs_file_t *file)
-{
+static int vfs_file_delref(vfs_file_t *file)
+{
+        int rc = EOK;
+
         assert(fibril_mutex_is_locked(&VFS_DATA->lock));
 
         if (file->refcnt-- == 1) {
                 /*
-                 * Lost the last reference to a file, need to drop our reference
-                 * to the underlying VFS node.
+                 * Lost the last reference to a file, need to close it in the
+                 * endpoint FS and drop our reference to the underlying VFS node.
                  */
+                rc = vfs_file_close_remote(file);
                 vfs_node_delref(file->node);
                 free(file);
         }
+
+        return rc;
 }
 
@@ -201 +224 @@
 int vfs_fd_free(int fd)
 {
+        int rc;
+
         if (!vfs_files_init())
                 return ENOMEM;
@@ -210 +235 @@
         }
         
-        vfs_file_delref(FILES[fd]);
+        rc = vfs_file_delref(FILES[fd]);
         FILES[fd] = NULL;
         fibril_mutex_unlock(&VFS_DATA->lock);
         
-        return EOK;
+        return rc;
 }