Changeset bb9ec2d in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-03-07T20:47:35Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

File:

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

uspace/srv/vfs/vfs_file.c

@@ -59 +59 @@
 typedef struct {
         link_t link;
-        int handle;
+        vfs_node_t *node;
+        int permissions;
 } vfs_boxed_handle_t;
 
@@ -365 +366 @@
         vfs_client_data_t *acceptor_data = NULL;
         vfs_file_t *donor_file = NULL;
-        vfs_file_t *acceptor_file = NULL;
         vfs_boxed_handle_t *bh;
-        int acceptor_fd;
 
         acceptor_data = async_get_client_data_by_id(acceptor_id);
@@ -377 +376 @@
 
         link_initialize(&bh->link);
-        bh->handle = -1;
+        bh->node = NULL;
 
         donor_data = async_get_client_data_by_id(donor_id);
@@ -386 +385 @@
         if (!donor_file)
                 goto out;
-
-        acceptor_fd = _vfs_fd_alloc(acceptor_data, &acceptor_file, false);
-        if (acceptor_fd < 0)
-                goto out;
-
-        bh->handle = acceptor_fd;
 
         /*
@@ -397 +390 @@
          */
         vfs_node_addref(donor_file->node);
-
-        assert(acceptor_file);
-
-        /*
-         * Inherit attributes from the donor.
-         */
-        acceptor_file->node = donor_file->node;
-        acceptor_file->permissions = donor_file->permissions;
-        
-        // TODO: The file should not inherit its open status, but clients depend on this.
-        acceptor_file->pos = donor_file->pos;
-        acceptor_file->append = donor_file->append;
-        acceptor_file->open_read = donor_file->open_read;
-        acceptor_file->open_write = donor_file->open_write;
-
-        if (acceptor_file->open_read || acceptor_file->open_write) {
-                (void) vfs_open_node_remote(acceptor_file->node);
-        }
+        bh->node = donor_file->node;
+        bh->permissions = donor_file->permissions;
 
 out:
@@ -428 +405 @@
         if (donor_file)
                 _vfs_file_put(donor_data, donor_file);
-        if (acceptor_file)
-                _vfs_file_put(acceptor_data, acceptor_file);
-
-}
-
-int vfs_wait_handle_internal(void)
+}
+
+int vfs_wait_handle_internal(bool high_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
-        int fd;
         
         fibril_mutex_lock(&vfs_data->lock);
@@ -446 +419 @@
 
         vfs_boxed_handle_t *bh = list_get_instance(lnk, vfs_boxed_handle_t, link);
-        fd = bh->handle;
+
+        vfs_file_t *file;
+        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
+        if (fd < 0) {
+                vfs_node_delref(bh->node);
+                free(bh);
+                return fd;
+        }
+        
+        file->node = bh->node;
+        file->permissions = bh->permissions;
+        vfs_file_put(file);
         free(bh);
-
         return fd;
 }